Fix regex conflict

marvelhoax · Aug 23, 2017 · 952e562 · 952e562
1 parent 016d0a9
commit 952e562
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ropgadget/gadgets.py b/ropgadget/gadgets.py
@@ -85,9 +85,9 @@ def addROPGadgets(self, section):
 
         if arch == CS_ARCH_X86:
             gadgets = [
-                            [b"\xc3", 1, 1],               # ret
-                            [b"\xc2[\x00-\xff]{2}", 3, 1], # ret <imm>
-                            [b"\xcb", 1, 1],               # retf
+                            [b"\xc3", 1, 1],                # ret
+                            [b"\xc2[\x00-\xff]{2}", 3, 1],  # ret <imm>
+                            [b"\xcb", 1, 1],                # retf
                             [b"\xca[\x00-\xff]{2}", 3, 1],  # retf <imm>
                             # MPX
                             [b"\xf2\xc3", 2, 1],               # ret
@@ -160,7 +160,7 @@ def addJOPGadgets(self, section):
         elif arch == CS_ARCH_ARM64:
             gadgets = [
                                [b"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}[\x1f\x5f]{1}\xd6", 4, 4],  # br reg
-                               [b"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}\x3f\xd6", 4, 4]  # blr reg
+                               [b"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}\?\xd6", 4, 4]  # blr reg
                       ]
             arch_mode = CS_MODE_ARM
         elif arch == CS_ARCH_ARM:

diff --git a/ropgadget/version.py b/ropgadget/version.py
@@ -7,6 +7,6 @@
 ## 
 
 MAJOR_VERSION       = 5
-MINOR_VERSION       = 5
+MINOR_VERSION       = 6
 PYROPGADGET_VERSION = "ROPgadget v%d.%d" %(MAJOR_VERSION, MINOR_VERSION)
 
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@ def fullsplit(path, result=None):
     elif filenames:
         data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
 
-version = "5.5"
+version = "5.6"
 
 setup(
     name             = package_name,