Backport non UTF-8 file name bugfix from pyinstxtractor-ng

extremecoders-re · Aug 20, 2023 · 9565295 · 9565295
1 parent 4c89bd5
commit 9565295
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pyinstxtractor.py b/pyinstxtractor.py
@@ -231,7 +231,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("/"):