mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-10 07:09:32 +00:00
Stashed here for now, still need to test and comment but exception handling is fixed
This commit is contained in:
parent
05b4298576
commit
b5d13c8928
@ -269,8 +269,7 @@ class MSOfficeEmbeddedContentExtractor {
|
|||||||
HWPFDocument doc = new HWPFDocument(new ReadContentInputStream(af));
|
HWPFDocument doc = new HWPFDocument(new ReadContentInputStream(af));
|
||||||
PicturesTable pictureTable = doc.getPicturesTable();
|
PicturesTable pictureTable = doc.getPicturesTable();
|
||||||
listOfAllPictures = pictureTable.getAllPictures();
|
listOfAllPictures = pictureTable.getAllPictures();
|
||||||
} catch (IOException | IllegalArgumentException
|
} catch (Exception ex) {
|
||||||
| IndexOutOfBoundsException | NullPointerException ex) {
|
|
||||||
// IOException:
|
// IOException:
|
||||||
// Thrown when the document has issues being read.
|
// Thrown when the document has issues being read.
|
||||||
|
|
||||||
@ -286,10 +285,9 @@ class MSOfficeEmbeddedContentExtractor {
|
|||||||
// These get thrown in certain images. The reason is unknown. It is
|
// These get thrown in certain images. The reason is unknown. It is
|
||||||
// likely due to problems with the file formats that POI is poorly
|
// likely due to problems with the file formats that POI is poorly
|
||||||
// handling.
|
// handling.
|
||||||
return null;
|
|
||||||
} catch (Throwable ex) {
|
//Any runtime exception escaping
|
||||||
// instantiating POI containers throw RuntimeExceptions
|
LOGGER.log(Level.WARNING, "Word document container could not be initialized. Reason: {0}", ex.getMessage()); //NON-NLS
|
||||||
LOGGER.log(Level.SEVERE, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.docContainer.init.err", af.getName()), ex); //NON-NLS
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -333,8 +331,7 @@ class MSOfficeEmbeddedContentExtractor {
|
|||||||
try {
|
try {
|
||||||
HSLFSlideShow ppt = new HSLFSlideShow(new ReadContentInputStream(af));
|
HSLFSlideShow ppt = new HSLFSlideShow(new ReadContentInputStream(af));
|
||||||
listOfAllPictures = ppt.getPictureData();
|
listOfAllPictures = ppt.getPictureData();
|
||||||
} catch (IOException | IllegalArgumentException
|
} catch (Exception ex) {
|
||||||
| IndexOutOfBoundsException ex) {
|
|
||||||
// IllegalArgumentException:
|
// IllegalArgumentException:
|
||||||
// This will catch OldFileFormatException, which is thrown when the
|
// This will catch OldFileFormatException, which is thrown when the
|
||||||
// document version is unsupported. The IllegalArgumentException may
|
// document version is unsupported. The IllegalArgumentException may
|
||||||
@ -346,10 +343,7 @@ class MSOfficeEmbeddedContentExtractor {
|
|||||||
// This gets thrown in certain images. The reason is unknown. It is
|
// This gets thrown in certain images. The reason is unknown. It is
|
||||||
// likely due to problems with the file formats that POI is poorly
|
// likely due to problems with the file formats that POI is poorly
|
||||||
// handling.
|
// handling.
|
||||||
return null;
|
LOGGER.log(Level.WARNING, "PPT container could not be initialized. Reason: {0}", ex.getMessage()); //NON-NLS
|
||||||
} catch (Throwable ex) {
|
|
||||||
// instantiating POI containers throw RuntimeExceptions
|
|
||||||
LOGGER.log(Level.SEVERE, NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.pptContainer.init.err", af.getName()), ex); //NON-NLS
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -422,9 +416,7 @@ class MSOfficeEmbeddedContentExtractor {
|
|||||||
try {
|
try {
|
||||||
Workbook xls = new HSSFWorkbook(new ReadContentInputStream(af));
|
Workbook xls = new HSSFWorkbook(new ReadContentInputStream(af));
|
||||||
listOfAllPictures = xls.getAllPictures();
|
listOfAllPictures = xls.getAllPictures();
|
||||||
} catch (IOException | LeftoverDataException
|
} catch (Exception ex) {
|
||||||
| RecordFormatException | IllegalArgumentException
|
|
||||||
| IndexOutOfBoundsException ex) {
|
|
||||||
// IllegalArgumentException:
|
// IllegalArgumentException:
|
||||||
// This will catch OldFileFormatException, which is thrown when the
|
// This will catch OldFileFormatException, which is thrown when the
|
||||||
// document version is unsupported. The IllegalArgumentException may
|
// document version is unsupported. The IllegalArgumentException may
|
||||||
@ -443,10 +435,7 @@ class MSOfficeEmbeddedContentExtractor {
|
|||||||
// These get thrown in certain images. The reason is unknown. It is
|
// These get thrown in certain images. The reason is unknown. It is
|
||||||
// likely due to problems with the file formats that POI is poorly
|
// likely due to problems with the file formats that POI is poorly
|
||||||
// handling.
|
// handling.
|
||||||
return null;
|
LOGGER.log(Level.WARNING, "Excel (.xls) document container could not be initialized. Reason: {0}", ex.getMessage()); //NON-NLS
|
||||||
} catch (Throwable ex) {
|
|
||||||
// instantiating POI containers throw RuntimeExceptions
|
|
||||||
LOGGER.log(Level.SEVERE, String.format("%s%s", NbBundle.getMessage(this.getClass(), "EmbeddedFileExtractorIngestModule.ImageExtractor.xlsContainer.init.err", af.getName()), af.getName()), ex); //NON-NLS
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user