kyush/pyinstxtractor
1
0
Fork 0
forked from mirrors/pyinstxtractor
Code Pull requests Activity

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

Browse source
This commit is contained in:
extremecoders-re 2023-08-21 02:39:38 +05:30 • committed by GitHub
commit 9565295780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pyinstxtractor.py
View file

@ -231,7 +231,12 @@ class PyInstArchive:
'!IIIBc{0}s'.format(entrySize - nameLen), \ '!IIIBc{0}s'.format(entrySize - nameLen), \
self.fPtr.read(entrySize - 4)) 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 # Prevent writing outside the extraction directory
if name.startswith("/"): if name.startswith("/"):