Skip to content

Fix hanging on truncated streams. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KOLANICH wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix hanging on truncated streams. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pwexplode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,8 @@ def explode(compressedstring):

# Add another bit
bitbuf = bitstream[pos:pos + len(bitbuf) + 1]
if not len(bitbuf):
break

# Move further
pos += len(bitbuf)
Expand Down Expand Up @@ -476,6 +478,8 @@ def explode(compressedstring):

# Add another bit and try again
bitbuf = bitstream[pos:pos + len(bitbuf) + 1]
if not len(bitbuf):
break

# Move further
pos += len(bitbuf)
Expand All @@ -499,14 +503,15 @@ def explode(compressedstring):

# Read remaining bits and add them to the distance.
bitbuf = bitstream[pos:pos + bitsleft][::-1]
dist += int(bitbuf, 2)
dist_delta = int(bitbuf, 2) if bitbuf else 0
dist += dist_delta

# Move further
pos += bitsleft

# Print
debug_print("The final distance is %d (raw: %d, shifted by %d: %d, added: %d)"
% (dist, raw_dist, bitsleft, shifted_dist, int(bitbuf, 2)))
% (dist, raw_dist, bitsleft, shifted_dist, dist_delta))

# Let's copy finally!
targetpos = len(decompresseddata)
Expand Down