|
|
@@ -98,15 +98,17 @@ def get_vtables_from_address(bin: "LinuxBinary", vt: Symbol) -> list[VTable]:
|
|
|
|
|
|
table_index = 0
|
|
|
function_list: list[VTableFunction] = []
|
|
|
- for n, addr in enumerate(range(vt.rebased_addr + 0x4 * 2, vt.rebased_addr + vt.size, 4)):
|
|
|
+ vtable_range = enumerate(range(vt.rebased_addr + 0x4 * 2, vt.rebased_addr + vt.size, 4))
|
|
|
+ for n, addr in vtable_range:
|
|
|
# get symbols that map to that address
|
|
|
deref = bin.angr.loader.fast_memory_load_pointer(addr)
|
|
|
fnsyms = set(vtda.syms_by_addr.get(deref) or set()) if deref else set()
|
|
|
if not fnsyms:
|
|
|
- # vtable boundary
|
|
|
+ # vtable boundary; consume typeinfo so it doesn't get added to the list
|
|
|
# NOTE: we don't actually care if the indices skip; all that matters is that the
|
|
|
# functions are grouped correctly
|
|
|
table_index += 1
|
|
|
+ next(vtable_range)
|
|
|
continue
|
|
|
|
|
|
if len(fnsyms) == 1 or not function_list:
|
