Modifications for new version of bitstream (#388)

angr · Apr 22, 2024 · 2726f4d · 2726f4d
1 parent 73e2460
commit 2726f4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pyvex/lifting/gym/arm_spotter.py b/pyvex/lifting/gym/arm_spotter.py
@@ -103,10 +103,12 @@ def _load_le_instr(self, bitstream: bitstring.ConstBitStream, numbits: int) -> s
         if (self.addr & 1) == 1 and numbits > 16:
             chunk = ""
             oldpos = bitstream.pos
-            for _ in range(0, numbits, 16):
-                chunk += bitstring.Bits(uint=bitstream.peek("uintle:%d" % 16), length=16).bin
-                bitstream.pos += 16
-            bitstream.pos = oldpos
+            try:
+                for _ in range(0, numbits, 16):
+                    chunk += bitstring.Bits(uint=bitstream.peek("uintle:%d" % 16), length=16).bin
+                    bitstream.pos += 16
+            finally:
+                bitstream.pos = oldpos
             return chunk
         return super()._load_le_instr(bitstream, numbits)
 

diff --git a/pyvex/lifting/util/lifter_helper.py b/pyvex/lifting/util/lifter_helper.py
@@ -71,7 +71,7 @@ def _decode_next_instruction(self, addr):
             # if we are out of input, ignore.
             # there may be other, shorter instructions that still match,
             # so we continue with the loop
-            except bitstring.ReadError:
+            except (bitstring.ReadError, bitstring.InterpretError):
                 pass
 
         # If no instruction matches, log an error