diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java index 831cdb652e..8589b0ea7d 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java @@ -144,6 +144,10 @@ public class MediaViewImagePanel extends javax.swing.JPanel { try { //original input stream BufferedImage bi = ImageIO.read(inputStream); + if (bi == null) { + logger.log(Level.WARNING, "Could image reader not found for file: " + fileName); + return; + } //scale image using Scalr BufferedImage biScaled = ScalrWrapper.resizeHighQuality(bi, (int) dims.getWidth(), (int) dims.getHeight()); //convert from awt imageto fx image diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java index 92ee76109f..ef562ae0c4 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java @@ -86,6 +86,9 @@ class ThumbnailViewNode extends FilterNode { if (getFile(content.getId()).exists()) { try { icon = ImageIO.read(getFile(content.getId())); + if (icon == null) { + icon = ThumbnailViewNode.defaultIcon; + } } catch (IOException ex) { icon = ThumbnailViewNode.defaultIcon; } @@ -120,6 +123,10 @@ class ThumbnailViewNode extends FilterNode { try { inputStream = new ReadContentInputStream(content); BufferedImage bi = ImageIO.read(inputStream); + if (bi == null) { + logger.log(Level.WARNING, "No image reader for file: " + content.getName()); + return null; + } BufferedImage biScaled = ScalrWrapper.resizeFast(bi, 100, 100); return biScaled; }catch (OutOfMemoryError e) {