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

Changed util.fiddling.hexdump_iter to take a file object instead of… #695

Merged
merged 1 commit into from
Aug 24, 2016

Conversation

br0ns
Copy link
Contributor

@br0ns br0ns commented Aug 24, 2016

… a string. This massively speeds up phd <file> | less for huge files.

… a string. This massively speeds up `phd <file> | less` for huge files.
@br0ns br0ns mentioned this pull request Aug 24, 2016
@zachriggle
Copy link
Member

I think that @idolf doesn't want any extra branches. In the future, create the PR from a fork.

For the purpose of back-ports, does this have any functional changes? Or can it just be rolled into the "next release"?

@zachriggle
Copy link
Member

Since this is against dev I'm just merging this myself :)

@zachriggle zachriggle merged commit d65991d into dev Aug 24, 2016
@zachriggle zachriggle deleted the fix-hexdump_iter-regression branch August 24, 2016 21:15
@br0ns
Copy link
Contributor Author

br0ns commented Aug 24, 2016

@zachriggle, OK, I'll do PR's from a fork in the future. Thanks for merging.

@zachriggle zachriggle modified the milestones: Someday, 3.2.0 Sep 1, 2016
@TethysSvensson
Copy link
Contributor

I am backporting this to stable now, as this is a regression fix.

TethysSvensson pushed a commit to TethysSvensson/pwntools that referenced this pull request Sep 6, 2016
… a string. This massively speeds up `phd <file> | less` for huge files. (Gallopsled#695)
@TethysSvensson TethysSvensson mentioned this pull request Sep 6, 2016
TethysSvensson pushed a commit that referenced this pull request Sep 6, 2016
… a string. This massively speeds up `phd <file> | less` for huge files. (#695) (#725)
@zachriggle zachriggle modified the milestones: 3.0.2, 3.2.0 Sep 14, 2016
@zachriggle
Copy link
Member

This was cherry-picked to 3.0.2 so realistically that's the milestone

zachriggle added a commit to zachriggle/pwntools that referenced this pull request Jan 10, 2017
This code wasnt updated when the code was changed to operate on file descriptors.

Additionally, there was a functional regression, that the first line would be skipped.

Fixes: Gallopsled#836
Caused by: Gallopsled#695 (d65991d)
zachriggle added a commit that referenced this pull request Jan 10, 2017
This code wasnt updated when the code was changed to operate on file descriptors.

Additionally, there was a functional regression, that the first line would be skipped.

Fixes: #836
Caused by: #695 (d65991d)
Kyle-Kyle pushed a commit to Kyle-Kyle/pwntools that referenced this pull request Apr 25, 2021
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.

3 participants