Merge pull request #108 from astewart-bah/ret_0x10_fix

make chains with retn 0x10 portable
angr · May 10, 2024 · 194f724 · 194f724
2 parents d0b6a0a + da90c2e
commit 194f724
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/angrop/rop_chain.py b/angrop/rop_chain.py
@@ -136,6 +136,8 @@ def _concretize_chain_values(self, constraints=None, timeout=None, preserve_next
         """
         concretize chain values with a timeout
         """
+        if self.next_pc_idx() is not None:
+            return (self + self._rop.chain_builder.shift(self._p.arch.bytes))._concretize_chain_values(constraints=constraints, timeout=timeout, preserve_next_pc=preserve_next_pc)
         if timeout is None:
             timeout = self._timeout
         values = rop_utils.timeout(timeout)(self.__concretize_chain_values)(constraints=constraints)