Use UUID for invalid file names, fixes #8

pyinstxtractor · Aug 20, 2023 · 6d0268c · 6d0268c
1 parent 480823e
commit 6d0268c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pyinstxtractor-ng.py b/pyinstxtractor-ng.py
@@ -192,7 +192,12 @@ def parseTOC(self):
                 "!IIIBc{0}s".format(entrySize - nameLen), self.fPtr.read(entrySize - 4)
             )
 
-            name = name.decode("utf-8").rstrip("\0")
+            try:
+                name = name.decode("utf-8").rstrip("\0")
+            except UnicodeDecodeError:
+                newName = str(uniquename())
+                print('[!] Warning: File name {0} contains invalid bytes. Using random name {1}'.format(name, newName))
+                name = newName
 
             # Prevent writing outside the extraction directory
             if name.startswith("/"):