You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ta...@apache.org on 2021/05/07 15:43:04 UTC
svn commit: r1889636 -
/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
Author: tallison
Date: Fri May 7 15:43:04 2021
New Revision: 1889636
URL: http://svn.apache.org/viewvc?rev=1889636&view=rev
Log:
Bug 65293 -- npe in HwmfFont
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java?rev=1889636&r1=1889635&r2=1889636&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java Fri May 7 15:43:04 2021
@@ -410,7 +410,8 @@ public class HwmfFont implements FontInf
pitchAndFamily = leis.readUByte();
StringBuilder sb = new StringBuilder();
- int readBytes = readString(leis, sb, 32, charSet.getCharset());
+ Charset actualCharset = (charSet == null) ? null : charSet.getCharset();
+ int readBytes = readString(leis, sb, 32, actualCharset);
if (readBytes == -1) {
throw new IOException("Font facename can't be determined.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org