You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/09/26 18:28:24 UTC
tika git commit: TIKA-2097 fix npe in MboxParser
Repository: tika
Updated Branches:
refs/heads/master 546646844 -> 308d26fb2
TIKA-2097 fix npe in MboxParser
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/308d26fb
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/308d26fb
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/308d26fb
Branch: refs/heads/master
Commit: 308d26fb297c6248f98d777b7a94192fc0ecfce2
Parents: 5466468
Author: tballison <ta...@mitre.org>
Authored: Mon Sep 26 14:28:16 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Mon Sep 26 14:28:16 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/tika/parser/mbox/MboxParser.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/308d26fb/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
index 86b1dd4..83e26da 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
@@ -103,7 +103,9 @@ public class MboxParser extends AbstractParser {
mailMetadata.add(EMAIL_FROMLINE_METADATA, curLine.substring(MBOX_RECORD_DIVIDER.length()));
mailMetadata.set(Metadata.CONTENT_TYPE, "message/rfc822");
curLine = reader.readLine();
-
+ if (curLine == null) {
+ break;
+ }
ByteArrayOutputStream message = new ByteArrayOutputStream(100000);
do {
if (curLine.startsWith(" ") || curLine.startsWith("\t")) {