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 2020/01/29 15:01:18 UTC
[tika] branch branch_1x updated: improve exception handling in
processCompObj
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_1x by this push:
new 5f88de9 improve exception handling in processCompObj
5f88de9 is described below
commit 5f88de995ae5b6352c775e9e485785e3ee5435f4
Author: tballison <ta...@apache.org>
AuthorDate: Wed Jan 29 10:01:03 2020 -0500
improve exception handling in processCompObj
---
.../org/apache/tika/parser/microsoft/POIFSContainerDetector.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
index 7f44913..d90c0ed 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
@@ -340,6 +340,10 @@ public class POIFSContainerDetector implements Detector {
*/
private static MediaType processCompObjFormatType(DirectoryEntry root) {
try {
+
+ if (! root.hasEntry("\u0001CompObj")) {
+ return OLE;
+ }
Entry e = root.getEntry("\u0001CompObj");
if (e != null && e.isDocumentEntry()) {
DocumentNode dn = (DocumentNode) e;
@@ -360,6 +364,8 @@ public class POIFSContainerDetector implements Detector {
return WPS;
}
}
+ } catch (SecurityException e) {
+ throw e;
} catch (Exception e) {
/*
* "root.getEntry" can throw FileNotFoundException. The code inside