|
|
@@ -394,7 +394,7 @@ class VtableDisambiguator(angr.Analysis):
|
|
|
|
|
|
function_list.append(VTableFunction(table_index, fnsyms))
|
|
|
|
|
|
- for n, vfn in enumerate(function_list):
|
|
|
+ for vfn in function_list:
|
|
|
# disambiguated_func_sigs may include an already unique match so we skip those
|
|
|
if len(vfn.possible_syms) > 1:
|
|
|
disambiguated_functions = set(
|
|
|
@@ -405,11 +405,13 @@ class VtableDisambiguator(angr.Analysis):
|
|
|
)
|
|
|
vfn.possible_syms -= disambiguated_functions
|
|
|
|
|
|
+ # final uniqueness pass
|
|
|
+ # raise exception if we still have multiple possible symbols for a given position
|
|
|
+ for n, vfn in enumerate(function_list):
|
|
|
if len(vfn.possible_syms) == 1:
|
|
|
continue
|
|
|
|
|
|
# we should never receive an empty ``VTableFunction.possible_syms``
|
|
|
- # for now we need to assert that a function address is unambiguous given the context
|
|
|
vt_name = demangler.parse(vt.name)
|
|
|
candidate_names = set(sym.name for sym in vfn.possible_syms)
|
|
|
raise Exception(
|
