[tika] branch master updated: TIKA-2867 - add null check for zipentry

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new c5280ae  TIKA-2867 - add null check for zipentry
c5280ae is described below

commit c5280aeeea321f41260a414a4d02f2540e36bf2d
Author: TALLISON <talli...@apache.org>
AuthorDate: Tue May 7 16:57:48 2019 -0400

    TIKA-2867 - add null check for zipentry
---
 .../src/main/java/org/apache/tika/parser/epub/EpubParser.java      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java 
b/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java
index 9f60be4..557d183 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java
@@ -235,10 +235,7 @@ public class EpubParser extends AbstractParser {
             return false;
         }
         ZipArchiveEntry zae = zipFile.getEntry(rootOPF);
-        if (zae == null) {
-            return false;
-        }
-        if (!zipFile.canReadEntryData(zae)) {
+        if (zae == null || !zipFile.canReadEntryData(zae)) {
             return false;
         }
         meta.parse(zipFile.getInputStream(zae), new DefaultHandler(), 
metadata, context);
@@ -336,7 +333,7 @@ public class EpubParser extends AbstractParser {
         String fullPath = relativePath + hRefMediaPair.href;
 
         ZipArchiveEntry ze = zipFile.getEntry(fullPath);
-        if (!zipFile.canReadEntryData(ze)) {
+        if (ze == null || !zipFile.canReadEntryData(ze)) {
             return;
         }
         Metadata embeddedMetadata = new Metadata();