dnrops
/
pwndbg
mirror of https://github.com/pwndbg/pwndbg
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add gdb.MemoryError check to get_heap() (#1145) 

Call fetch_lazy() on the gdb.Value acquired in get_heap() and wrap it in
a try/except block. Return None if gdb.MemoryError is raised.

Let get_arena_for_chunk() handle None returned by get_heap().

Fixes #1142
This commit is contained in:
CptGibbon 2022-09-14 09:01:15 -07:00 committed by GitHub
parent dea9a691d4
commit 8dae55490b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pwndbg/heap/ptmalloc.py
View File

@ -307,7 +307,8 @@ class Heap(pwndbg.heap.heap.BaseHeap):
chunk = pwndbg.commands.heap.read_chunk(addr) chunk = pwndbg.commands.heap.read_chunk(addr)
_, _, nm = self.chunk_flags(chunk["size"]) _, _, nm = self.chunk_flags(chunk["size"])
if nm: if nm:
r = self.get_arena(arena_addr=self.get_heap(addr)["ar_ptr"]) h = self.get_heap(addr)
r = self.get_arena(h["ar_ptr"]) if h else None
else: else:
r = self.main_arena r = self.main_arena
return r return r
@ -634,7 +635,13 @@ class DebugSymsHeap(Heap):
def get_heap(self, addr): def get_heap(self, addr):
"""Find & read the heap_info struct belonging to the chunk at 'addr'.""" """Find & read the heap_info struct belonging to the chunk at 'addr'."""
return pwndbg.gdblib.memory.poi(self.heap_info, heap_for_ptr(addr)) try:
r = pwndbg.gdblib.memory.poi(self.heap_info, heap_for_ptr(addr))
r.fetch_lazy()
except gdb.MemoryError:
r = None
return r
def get_arena(self, arena_addr=None): def get_arena(self, arena_addr=None):
"""Read a malloc_state struct from the specified address, default to """Read a malloc_state struct from the specified address, default to