linting

angr · May 10, 2024 · d8f6144 · d8f6144
1 parent c193b20
commit d8f6144
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/angrop/rop_chain.py b/angrop/rop_chain.py
@@ -137,7 +137,12 @@ 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)
+            # make sure we don't leave a dangling `next_pc` value in the chain
+            # which may corrupt chain concatenation at byte-level
+            full_chain = self + self._rop.chain_builder.shift(self._p.arch.bytes)
+            return full_chain._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)