From ef61965acf58c994b795b56c07eeea5c2e3adc3a Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Thu, 5 Dec 2013 13:16:05 -0500 Subject: [PATCH 1/2] Fixed string out of bounds exception in hex viewer on os x. --- Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java index b4672bbb55..e0b4f67e78 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java @@ -102,7 +102,7 @@ public class DataConversion { outputStringBuilder.append(" "); // print the ascii columns - String ascii = new String(array, curOffset, lineLen); + String ascii = new String(array, curOffset, lineLen, java.nio.charset.StandardCharsets.US_ASCII); for (int i = 0; i < 16; i++) { char c = ' '; if (i < lineLen) { From d9ca04e4766a9d0fe318d0ba39ad141f00c4efc4 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Fri, 6 Dec 2013 16:01:03 -0500 Subject: [PATCH 2/2] Don't get a character that's out of range. --- Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java index e0b4f67e78..5c7ff971f5 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java @@ -105,7 +105,7 @@ public class DataConversion { String ascii = new String(array, curOffset, lineLen, java.nio.charset.StandardCharsets.US_ASCII); for (int i = 0; i < 16; i++) { char c = ' '; - if (i < lineLen) { + if (i < ascii.length()) { c = ascii.charAt(i); int dec = (int) c;