From 50394e659ddb91ea69f13960a0cfcd749e694bf4 Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Fri, 12 Jun 2015 13:26:19 -0400 Subject: [PATCH] null check for value returned by fileTypeDetector.getFileType(AbstractFile) --- .../autopsy/modules/exif/ExifParserFileIngestModule.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java index 013247c086..992de4c228 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java @@ -204,7 +204,12 @@ public final class ExifParserFileIngestModule implements FileIngestModule { */ private boolean parsableFormat(AbstractFile f) { try { - return fileTypeDetector.getFileType(f).equals("image/jpeg"); + String mimeType = fileTypeDetector.getFileType(f); + if (mimeType != null) { + return fileTypeDetector.getFileType(f).equals("image/jpeg"); + } else { + return false; + } } catch (TskCoreException ex) { logger.log(Level.SEVERE, "Failed to detect file type", ex); //NON-NLS return false;