Merge pull request #171 from ramikg/patch-1

Make badbytes range inclusive
JonathanSalwan · Apr 2, 2021 · 2f49bdf · 2f49bdf
2 parents a4b583f + 6777354
commit 2f49bdf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/ropgadget/options.py b/ropgadget/options.py
@@ -119,7 +119,6 @@ def __isGadgetCallPreceded(gadget):
             print("Options().removeNonCallPreceded(): Unsupported architecture.")
 
     def __deleteBadBytes(self):
-        archMode = self.__binary.getArchMode()
         if not self.__options.badbytes:
             return
         new = []
@@ -131,7 +130,7 @@ def __deleteBadBytes(self):
                 rng = bb.split('-')
                 low = ord(codecs.decode(rng[0], "hex"))
                 high = ord(codecs.decode(rng[1], "hex"))
-                bbytes += bytes(bytearray(i for i in range(low, high)))
+                bbytes += bytes(bytearray(i for i in range(low, high + 1)))
             else:
                 bbytes.append(codecs.decode(bb.encode("ascii"), "hex"))
 

diff --git a/test-suite-binaries/ref_output.bz2 b/test-suite-binaries/ref_output.bz2
diff --git a/test-suite-binaries/test.sh b/test-suite-binaries/test.sh
@@ -51,8 +51,8 @@ echo "RUN elf-Linux-x86 --memstr \"/bin/sh\"" | tee -a  ./test_output
 $RUN --binary ./elf-Linux-x86 --memstr "/bin/sh" 1>> ./test_output
 echo "RUN elf-Linux-x86 --badbytes \"00|01-1f|7f|42\"" | tee -a  ./test_output
 $RUN --binary ./elf-Linux-x86 --badbytes "00|01-1f|7f|42" 1>> ./test_output
-echo "RUN elf-Linux-x86 --offset 5555e000 --badbytes \"00-20|80-ff|ff\"" | tee -a  ./test_output
-$RUN --binary ./elf-Linux-x86 --offset 5555e000 --badbytes "00-20|80-ff|ff" 1>> ./test_output
+echo "RUN elf-Linux-x86 --offset 5555e000 --badbytes \"00-20|80-ff\"" | tee -a  ./test_output
+$RUN --binary ./elf-Linux-x86 --offset 5555e000 --badbytes "00-20|80-ff" 1>> ./test_output
 echo "RUN Linux_lib64.so --offset 0xdeadbeef00000000" | tee -a  ./test_output
 $RUN --binary ./Linux_lib64.so --offset 0xdeadbeef00000000 1>> ./test_output
 echo "RUN elf-ARMv7-ls --depth 5" | tee -a  ./test_output