From 8a2ce9d9dfdfeab33aa38b06011c41fb56272843 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Mon, 18 Jan 2016 20:16:23 +0000 Subject: [PATCH] Fix possible NPE found with msg-file from CommonCrawl git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1725334 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hsmf/extractor/OutlookTextExtactor.java | 2 +- test-data/hsmf/logsat.com_signatures_valid.msg | Bin 0 -> 23040 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 test-data/hsmf/logsat.com_signatures_valid.msg diff --git a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java b/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java index be396f3b00..0d949dff56 100644 --- a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java +++ b/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java @@ -153,7 +153,7 @@ public class OutlookTextExtactor extends POIOLE2TextExtractor { for(AttachmentChunks att : msg.getAttachmentFiles()) { StringChunk name = att.attachLongFileName; if (name == null) name = att.attachFileName; - String attName = name.getValue(); + String attName = name == null ? null : name.getValue(); if(att.attachMimeTag != null && att.attachMimeTag.getValue() != null) { diff --git a/test-data/hsmf/logsat.com_signatures_valid.msg b/test-data/hsmf/logsat.com_signatures_valid.msg new file mode 100755 index 0000000000000000000000000000000000000000..a074325109623f9804a1da7691fa37a6469fdfbf GIT binary patch literal 23040 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 ATL1t6 literal 0 HcmV?d00001 -- 2.39.5