Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 65293 -- npe in HwmfFont 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1889636 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tim Allison 2021-05-07 15:43:04 +00:00
parent 841d558018
commit b3f53ff0bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
View File

@ -410,7 +410,8 @@ public class HwmfFont implements FontInfo, GenericRecord {
pitchAndFamily = leis.readUByte(); pitchAndFamily = leis.readUByte();
StringBuilder sb = new StringBuilder(); 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) { if (readBytes == -1) {
throw new IOException("Font facename can't be determined."); throw new IOException("Font facename can't be determined.");
} }