when unpacking bytes to text, use errorMode ignore

KBNLresearch · Jan 25, 2018 · 376cf1c · 376cf1c
1 parent 9fb8f56
commit 376cf1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/isolyzer/apple.py b/isolyzer/apple.py
@@ -104,8 +104,11 @@ def parseMasterDirectoryBlock(bytesData):
                        bc.bytesToUShortInt(bytesData[18:20]))
     shared.addProperty(properties, "blockCount",
                        bc.bytesToUInt(bytesData[20:24]))
+
+    charsVolumeName = bc.bytesToUnsignedChar(bytesData[36:37])
+
     shared.addProperty(properties, "volumeName",
-                       bc.bytesToText(bytesData[37:63]))
+                       bc.bytesToText(bytesData[37:37 + charsVolumeName]))
 
     return properties
 

diff --git a/isolyzer/byteconv.py b/isolyzer/byteconv.py
@@ -150,7 +150,8 @@ def bytesToText(bytestring):
 
     # Set encoding and error mode
     enc = "utf-8"
-    errorMode = "strict"
+    #errorMode = "strict"
+    errorMode = "ignore"
 
     try:
         # Decode to utf-8