small change to largebins() and contains_chunk() #1314
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -94,10 +94,7 @@ def contains_chunk(self, size, chunk): | |||
|
|
|||
| # TODO: Refactor this, the bin should know how to calculate | |||
| # largebin_index without calling into the allocator | |||
There was a problem hiding this comment.
just to be sure: is this comment still relevant?
There was a problem hiding this comment.
Yes, it's still relevant. With an ideal design, there should be no need to call pwndbg.heap.current.largebin_index(size), as the algorithm for doing that doesn't depend on having a reference to an actual allocator. Not a big deal right now, but this separation will help in the long run.
gsingh93
reviewed
Oct 21, 2022
pwndbg/heap/ptmalloc.py
Outdated
| @@ -94,10 +94,7 @@ def contains_chunk(self, size, chunk): | |||
|
|
|||
| # TODO: Refactor this, the bin should know how to calculate | |||
| # largebin_index without calling into the allocator | |||
| if size < list(self.bins.items())[0][0]: | |||
| return False | |||
| size = pwndbg.heap.current.largebin_index(size) - 64 | |||
There was a problem hiding this comment.
I think we should make a constant for NSMALLBINS and use it here instead of 64, so it's more clear why we're doing this.
gsingh93
approved these changes
Oct 22, 2022
CptGibbon
approved these changes
Oct 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
small change to largebins() and contains_chunk() so that accessing a largebin uses the index (calculated from chunk size) as the key instead of the chunk size