Skip to content

Fix pwnlib.util.packing.fit. Fixes #617. #620

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

Closed
peter50216 wants to merge 1 commit into from
Closed

Fix pwnlib.util.packing.fit. Fixes #617. #620

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 pwnlib/util/packing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,14 +576,14 @@ def fit(pieces, **kwargs):
>>> fit({12: 0x41414141,
... 24: 'Hello',
... })
'aaaabaaacaaaAAAAdaaaeaaaHello'
'aaaabaaacaaaAAAAeaaafaaaHello'
>>> fit({'caaa': ''})
'aaaabaaa'
>>> fit({12: 'XXXX'}, filler = 'AB', length = 20)
'ABABABABABABXXXXABAB'
>>> fit({ 8: [0x41414141, 0x42424242],
... 20: 'CCCC'})
'aaaabaaaAAAABBBBcaaaCCCC'
'aaaabaaaAAAABBBBeaaaCCCC'

"""
# HACK: To avoid circular imports we need to delay the import of `cyclic`
Expand Down Expand Up @@ -627,6 +627,11 @@ def fit(pieces, **kwargs):
out.append(filler.next())
v = _flat([v], preprocessor, packer)
l = k + len(v)

# consume the filler for each byte of actual data
for i in range(len(out), l):
filler.next()

out[k:l] = v

# truncate/pad output
Expand Down