mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 01:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1357 from sidheshenator/exif_parser_NPE_check

Browse Source 
null check for value returned by getFileType(AbstractFile)
This commit is contained in:
Richard Cordovano 2015-06-12 13:31:46 -04:00
commit 8483f45bba
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java
View File

@ -204,7 +204,12 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
*/ */
private boolean parsableFormat(AbstractFile f) { private boolean parsableFormat(AbstractFile f) {
try { 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) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Failed to detect file type", ex); //NON-NLS logger.log(Level.SEVERE, "Failed to detect file type", ex); //NON-NLS
return false; return false;