Skip to content
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.

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

Fix hexdump_iter for actual file objects, like those used by phd #846

Merged

Conversation

zachriggle
Copy link
Member

This is a regression introduced somewhere between 3.3.1 and 3.3.3 from earlier this week.

@zachriggle zachriggle added this to the 3.3.0 milestone Jan 11, 2017
@zachriggle zachriggle force-pushed the pwntools-3.3.3-phd-regression branch from c6433be to 1155573 Compare January 11, 2017 19:58
@zachriggle zachriggle merged commit 9c2f0f4 into Gallopsled:stable Jan 11, 2017
@zachriggle zachriggle added the bug label Jan 11, 2017
@zachriggle
Copy link
Member Author

@idolf ping

total = fd.tell()
total = fd.tell() - cur

# Restore the file offset, and
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And what?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No "and", just a dangling lost thought in a comment.

This commit is cherry-picked from dev (f46112e), which has the same dangling comment -- but also has tests which pass.

@TethysSvensson
Copy link
Contributor

phd is still broken, even with this commit.

head -c 128 /bin/sh | phd

@zachriggle zachriggle deleted the pwntools-3.3.3-phd-regression branch February 16, 2017 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants