From b6d0c3c5b69bd812ea453f95d0a267da21c79b30 Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Fri, 19 Jun 2015 11:43:13 -0400 Subject: [PATCH 1/2] catch all throwables while instantiating the POI container --- .../embeddedfileextractor/ImageExtractor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java index 0ac96aedd1..4ed8341e37 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java @@ -207,7 +207,7 @@ class ImageExtractor { HWPFDocument doc = null; try { doc = new HWPFDocument(new ReadContentInputStream(af)); - } catch (IOException | OldFileFormatException ex) { + } catch (Throwable ex) { logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.docContainer.init.err", af.getName())); //NON-NLS return null; } @@ -245,7 +245,7 @@ class ImageExtractor { XWPFDocument docx = null; try { docx = new XWPFDocument(new ReadContentInputStream(af)); - } catch (IOException | OldFileFormatException ex) { + } catch (Throwable ex) { logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.docxContainer.init.err", af.getName())); //NON-NLS return null; } @@ -284,7 +284,7 @@ class ImageExtractor { SlideShow ppt = null; try { ppt = new SlideShow(new ReadContentInputStream(af)); - } catch (IOException | OldFileFormatException ex) { + } catch (Throwable ex) { logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.pptContainer.init.err", af.getName())); //NON-NLS return null; } @@ -354,7 +354,7 @@ class ImageExtractor { XMLSlideShow pptx; try { pptx = new XMLSlideShow(new ReadContentInputStream(af)); - } catch (IOException | OldFileFormatException ex) { + } catch (Throwable ex) { logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.pptxContainer.init.err", af.getName())); //NON-NLS return null; } @@ -401,7 +401,7 @@ class ImageExtractor { Workbook xls; try { xls = new HSSFWorkbook(new ReadContentInputStream(af)); - } catch (IOException | OldFileFormatException ex) { + } catch (Throwable ex) { logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.xlsContainer.init.err", af.getName()) + af.getName()); //NON-NLS return null; } @@ -444,7 +444,7 @@ class ImageExtractor { Workbook xlsx; try { xlsx = new XSSFWorkbook(new ReadContentInputStream(af)); - } catch (IOException | OldFileFormatException ex) { + } catch (Throwable ex) { logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.xlsxContainer.init.err", af.getName())); //NON-NLS return null; } From 03731d9756916aeeed71ee5ac8ac8dde9339f42c Mon Sep 17 00:00:00 2001 From: Sidhesh Mhatre Date: Fri, 19 Jun 2015 13:23:27 -0400 Subject: [PATCH 2/2] comment about POI RuntimeExceptions added --- .../modules/embeddedfileextractor/ImageExtractor.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java index 4ed8341e37..7a48c061ad 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/ImageExtractor.java @@ -208,6 +208,7 @@ class ImageExtractor { try { doc = new HWPFDocument(new ReadContentInputStream(af)); } catch (Throwable ex) { + // instantiating POI containers throw RuntimeExceptions logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.docContainer.init.err", af.getName())); //NON-NLS return null; } @@ -246,6 +247,7 @@ class ImageExtractor { try { docx = new XWPFDocument(new ReadContentInputStream(af)); } catch (Throwable ex) { + // instantiating POI containers throw RuntimeExceptions logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.docxContainer.init.err", af.getName())); //NON-NLS return null; } @@ -285,6 +287,7 @@ class ImageExtractor { try { ppt = new SlideShow(new ReadContentInputStream(af)); } catch (Throwable ex) { + // instantiating POI containers throw RuntimeExceptions logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.pptContainer.init.err", af.getName())); //NON-NLS return null; } @@ -355,6 +358,7 @@ class ImageExtractor { try { pptx = new XMLSlideShow(new ReadContentInputStream(af)); } catch (Throwable ex) { + // instantiating POI containers throw RuntimeExceptions logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.pptxContainer.init.err", af.getName())); //NON-NLS return null; } @@ -402,6 +406,7 @@ class ImageExtractor { try { xls = new HSSFWorkbook(new ReadContentInputStream(af)); } catch (Throwable ex) { + // instantiating POI containers throw RuntimeExceptions logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.xlsContainer.init.err", af.getName()) + af.getName()); //NON-NLS return null; } @@ -445,6 +450,7 @@ class ImageExtractor { try { xlsx = new XSSFWorkbook(new ReadContentInputStream(af)); } catch (Throwable ex) { + // instantiating POI containers throw RuntimeExceptions logger.log(Level.WARNING, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.xlsxContainer.init.err", af.getName())); //NON-NLS return null; } @@ -590,4 +596,4 @@ class ImageExtractor { return parentFile; } } -} \ No newline at end of file +}