From bccd3c6d797a6fed09fe5d0c1da44960c5d93353 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-2925.basistech.net>
Date: Mon, 4 Jan 2021 19:40:18 -0500
Subject: [PATCH 1/2] Added a fire wall around jackcess

---
 .../EncryptionDetectionFileIngestModule.java               | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
index 9afafb7831..2a16a1aed7 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
@@ -322,9 +322,12 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
                     databaseBuilder.setChannel(memFileChannel);
                     databaseBuilder.setCodecProvider(codecProvider);
                     Database accessDatabase;
-                    try {
+                                        try {
                         accessDatabase = databaseBuilder.open();
-                    } catch (IOException | BufferUnderflowException | IndexOutOfBoundsException ignored) {
+                    } catch (Exception ex) { // Firewall, see JIRA-7097
+                        logger.log(Level.WARNING, String.format("Unexpected exception "
+                                + "trying to open msaccess database using Jackcess "
+                                + "(name: %s, id: %d)", file.getName(), file.getId()), ex);
                         return passwordProtected; 
                     }
                     /*

From 3185ded17865fa6ab5e38da2b46617b43b6781c7 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-2925.basistech.net>
Date: Mon, 4 Jan 2021 20:47:55 -0500
Subject: [PATCH 2/2] Fixed spacing on new try block

---
 .../EncryptionDetectionFileIngestModule.java                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
index 2a16a1aed7..aed3afc50d 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
@@ -322,7 +322,7 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
                     databaseBuilder.setChannel(memFileChannel);
                     databaseBuilder.setCodecProvider(codecProvider);
                     Database accessDatabase;
-                                        try {
+                    try {
                         accessDatabase = databaseBuilder.open();
                     } catch (Exception ex) { // Firewall, see JIRA-7097
                         logger.log(Level.WARNING, String.format("Unexpected exception "