From 083b8d0bfd94f46e765a01ee304fce75e6486f79 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Thu, 5 Jul 2018 15:56:03 -0400
Subject: [PATCH] 3996 improve opencv logging and prevent any opencv exceptions
 from escaping process method

---
 .../ObjectDetectectionFileIngestModule.java   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java b/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java
index fe86fb9f0b..ca0dd1cf89 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java
@@ -106,10 +106,22 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
             try {
                 imageInMemory = IOUtils.toByteArray(inputStream);
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unable to perform object detection on " + file.getName(), ex);
+                logger.log(Level.WARNING, "Unable to read image to byte array for performing object detection on " + file.getName(), ex);
                 return IngestModule.ProcessResult.ERROR;
             }
-            Mat originalImage = Highgui.imdecode(new MatOfByte(imageInMemory), Highgui.IMREAD_GRAYSCALE);
+            Mat originalImage;
+            try {
+                originalImage = Highgui.imdecode(new MatOfByte(imageInMemory), Highgui.IMREAD_GRAYSCALE);
+            } catch (CvException ex) {
+                //The image was something which could not be decoded by OpenCv, our isImageThumbnailSupported(file) check above failed us
+                logger.log(Level.WARNING, "Unable to decode image from byte array to perform object detection on " + file.getName(), ex); //NON-NLS
+                return IngestModule.ProcessResult.ERROR;
+            } catch (Exception unexpectedException) {
+                //hopefully an unnecessary generic exception catch but currently present to catch any exceptions OpenCv throws which may not be documented
+                logger.log(Level.SEVERE, "Unexpected Exception encountered attempting to use OpenCV to decode picture: " + file.getName(), unexpectedException);
+                return IngestModule.ProcessResult.ERROR;
+            }
+
             MatOfRect detectionRectangles = new MatOfRect(); //the rectangles which reprent the coordinates on the image for where objects were detected
             for (String classifierKey : classifiers.keySet()) {
                 //apply each classifier to the file
@@ -119,6 +131,10 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
                     //The image was likely an image which we are unable to generate a thumbnail for, and the classifier was likely one where that is not acceptable
                     logger.log(Level.INFO, String.format("Classifier '%s' could not be applied to file '%s'.", classifierKey, file.getParentPath() + file.getName())); //NON-NLS
                     continue;
+                } catch (Exception unexpectedException) {  
+                    //hopefully an unnecessary generic exception catch but currently present to catch any exceptions OpenCv throws which may not be documented
+                    logger.log(Level.SEVERE, "Unexpected Exception encountered for image " + file.getName() + " while trying to apply classifier " + classifierKey, unexpectedException);
+                    continue;
                 }
 
                 if (!detectionRectangles.empty()) {