From b3f53ff0bc640cfbed894fbd7865757696d2a944 Mon Sep 17 00:00:00 2001 From: Tim Allison Date: Fri, 7 May 2021 15:43:04 +0000 Subject: [PATCH] Bug 65293 -- npe in HwmfFont git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1889636 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/poi/hwmf/record/HwmfFont.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java index ff64eee42d..c5ea678edc 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java @@ -410,7 +410,8 @@ public class HwmfFont implements FontInfo, GenericRecord { 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."); }