Merge pull request #1 from jkrshnmenon/fix-angr-update

Update arbiter to work with latest angr changes.
jkrshnmenon · Feb 23, 2022 · 9b647af · 9b647af
2 parents f6d1989 + a87f0af
commit 9b647af
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/arbiter/target.py b/arbiter/target.py
@@ -183,11 +183,12 @@ def next_block(self, bbl):
 
     def expr_from_state(self, project, state, arg_num):
         cca = project.analyses.CallingConvention(self._func)
-        if cca.cc is None or cca.cc.args is None:
+        args = cca.cc.arg_locs(cca.prototype)
+        if cca.cc is None or args is None:
             return None
         if arg_num == 0:
             return cca.cc.get_return_val(state)
-        elif len(cca.cc.args) >= arg_num:
+        elif len(args) >= arg_num:
             return cca.cc.arg(state, arg_num - 1)
 
     def checkpoint_is_ret(self, name):