Merge branch 'devel' of https://github.com/upx/upx into devel

This commit is contained in:
John Reiser
2016-11-21 08:23:05 -08:00
12 changed files with 335 additions and 781 deletions
View File
+1 -2
View File
@@ -178,8 +178,7 @@ def do_file(fn):
# FIXME / TODO
pass
else:
pass
#assert pos == len(odata), ("unexpected strip_with_dump", pos, len(odata))
assert pos == len(odata), ("unexpected strip_with_dump", pos, len(odata))
else:
if pos >= 0:
odata = idata[:pos]