[Scummvm-git-logs] scummvm master -> 32af1f2d2b3decd7d7aaf877892a6034019e6b81

[rvanlaar]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
32af1f2d2b DEVTOOLS: dumper-companion.py: better handle removing null bytes from partition type


Commit: 32af1f2d2b3decd7d7aaf877892a6034019e6b81
    https://github.com/scummvm/scummvm/commit/32af1f2d2b3decd7d7aaf877892a6034019e6b81
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-01-11T08:38:34+01:00

Commit Message:
DEVTOOLS: dumper-companion.py: better handle removing null bytes from partition type

This handles an edge case with a disc that has a partition type of `Apple_HFS\x00ition_map`

Changed paths:
    devtools/dumper-companion.py


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index 4942702a588..22d06964d50 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -318,7 +318,7 @@ def extract_volume(args: argparse.Namespace) -> int:
                     ">III", f.read(12)
                 )
                 f.seek(32, 1)
-                partition_type = f.read(32).decode("ascii").strip("\0")
+                partition_type = f.read(32).decode("ascii").split("\0")[0]
                 if partition_num <= num_partitions and partition_type != "Apple_HFS":
                     # Move onto the next partition
                     partition_num += 1