diff --git a/isolyzer/apple.py b/isolyzer/apple.py index 232872f..7954633 100644 --- 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 index 5687550..cfb50c5 100644 --- 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