sashs/Ropper
1
0
Fork 0
mirror of https://github.com/sashs/Ropper.git synced 2026-10-12 02:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from FranciscoPombal/fix-escape-sequences

Browse Source 
Fix `SyntaxWarning` invalid escape sequences in regex strings
This commit is contained in:
Sascha Schirra
2026-08-22 19:05:00 +02:00
committed by GitHub
parent 1354ad399f ac1b1716f9
commit a2ffccf046
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ropper/arch.py
+6 -6
View File
@@ -244,9 +244,9 @@ class ArchitectureX86(Architecture):
def _initCategories(self):
self._categories = {
gadget.Category.STACK_PIVOT : (('^sub (?P<dst>.sp), (?P<src>[x0-9a-fA-F]+)$','^add (?P<dst>.sp), (?P<src>[x0-9a-fA-F]+)$','^mov (?P<dst>.sp), .+ ptr \[(?P<src>...)\]$','^mov (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>...), (?P<src>.sp)$','ret.+'),('push','mov','call','jmp')),
gadget.Category.LOAD_MEM : (('mov (?P<dst>...), .+ ptr \[(?P<src>...)\]',),('push','mov','call','jmp')),
gadget.Category.WRITE_MEM : (('^mov .+ ptr \[(?P<dst>...)\], (?P<src>...)$',),('push','mov','call','jmp')),
gadget.Category.STACK_PIVOT : (('^sub (?P<dst>.sp), (?P<src>[x0-9a-fA-F]+)$','^add (?P<dst>.sp), (?P<src>[x0-9a-fA-F]+)$',r'^mov (?P<dst>.sp), .+ ptr \[(?P<src>...)\]$','^mov (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>...), (?P<src>.sp)$','ret.+'),('push','mov','call','jmp')),
gadget.Category.LOAD_MEM : ((r'mov (?P<dst>...), .+ ptr \[(?P<src>...)\]',),('push','mov','call','jmp')),
gadget.Category.WRITE_MEM : ((r'^mov .+ ptr \[(?P<dst>...)\], (?P<src>...)$',),('push','mov','call','jmp')),
gadget.Category.LOAD_REG : (('pop (?P<dst>...)',),('push','mov','call','jmp')),
gadget.Category.JMP : (('^jmp (?P<dst>...)$',),()),
gadget.Category.CALL : (('^call (?P<dst>...)$',),('push','mov','call','jmp')),
@@ -294,9 +294,9 @@ class ArchitectureX86_64(ArchitectureX86):
def _initCategories(self):
self._categories = {
gadget.Category.STACK_PIVOT : (('^mov (?P<dst>.sp), .+ ptr \[(?P<src>...)\]$','^mov (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>...), (?P<src>.sp)$','ret.+'),('push','mov','call','jmp')),
gadget.Category.LOAD_MEM : (('mov (?P<dst>r..), .+ ptr \[(?P<src>r..)\]',),('push','mov','call','jmp')),
gadget.Category.WRITE_MEM : (('^mov .+ ptr \[(?P<dst>r..)\], (?P<src>r..)$',),('push','mov','call','jmp')),
gadget.Category.STACK_PIVOT : ((r'^mov (?P<dst>.sp), .+ ptr \[(?P<src>...)\]$','^mov (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>.sp), (?P<src>...)$','^xchg (?P<dst>...), (?P<src>.sp)$','ret.+'),('push','mov','call','jmp')),
gadget.Category.LOAD_MEM : ((r'mov (?P<dst>r..), .+ ptr \[(?P<src>r..)\]',),('push','mov','call','jmp')),
gadget.Category.WRITE_MEM : ((r'^mov .+ ptr \[(?P<dst>r..)\], (?P<src>r..)$',),('push','mov','call','jmp')),
gadget.Category.LOAD_REG : (('pop (?P<dst>r..)',),('push','mov','call','jmp')),
gadget.Category.JMP : (('^jmp (?P<dst>r..)$',),()),
gadget.Category.CALL : (('^call (?P<dst>r..)$',),('push','mov','call','jmp')),
ropper/console.py
+1 -1
View File
@@ -738,7 +738,7 @@ nx\t- Clears the NX-Flag (ELF|PE)"""
if len(text) == 0:
self.help_search()
return
match = re.match('/\d+/', text)
match = re.match(r'/\d+/', text)
qual = None
if match:
qual = int(match.group(0)[1:-1])
ropper/rop.py
+2 -2
View File
@@ -164,7 +164,7 @@ class Ropper(object):
if opcode.find(b) % 2 == 0:
opcode = opcode.replace(b,b'%s%s' % (hexlify(b'\\'),b))
m = re.search(b'\?', opcode)
m = re.search(rb'\?', opcode)
while m:
if m.start() % 2 == 0:
char = opcode[m.start()+1]
@@ -184,7 +184,7 @@ class Ropper(object):
opcode = opcode[:m.start()-1] + hexlify(b'['+pack('B',start)+b'-'+pack('B',end)+b']') + opcode[m.start()+1:]
m = re.search(b'\?', opcode)
m = re.search(rb'\?', opcode)
try:
opcode = unhexlify(opcode)
ropper/search.py
+2 -2
View File
@@ -43,7 +43,7 @@ import sys
class Searcher(object):
CONSTRAINT_REGEX = '(\[?[a-zA-Z0-9]+\]?)([\+\*\-=/])?=(\[?[a-zA-Z0-9]+\]?)$'
CONSTRAINT_REGEX = r'(\[?[a-zA-Z0-9]+\]?)([\+\*\-=/])?=(\[?[a-zA-Z0-9]+\]?)$'
def prepareFilter(self, filter):
filter = filter.replace('\\','\\\\')
@@ -257,6 +257,6 @@ class SearcherMIPS(Searcher):
def prepareFilter(self, filter):
filter = super(SearcherMIPS, self).prepareFilter(filter)
filter = filter.replace('$','\$')
filter = filter.replace('$',r'\$')
return filter
ropper/z3helper.py
+2 -2
View File
@@ -43,8 +43,8 @@ class ConstraintCompiler(object):
NUMBER_REGEX = '(-?[0-9]+)'
REG_REGEX = '(?P<{}>[a-zA-Z0-9]+)'
ADJUST_REGEX = '([\\+\-\*/=]=)'
ASSIGNMENT_REGEX = '('+REG_REGEX.format('reg_dst_1') + ' *' + ADJUST_REGEX + ' *('+NUMBER_REGEX+'|'+REG_REGEX.format('reg_src_1')+'|(\[)'+REG_REGEX.format('reg_src_2')+'(\])))'
ADJUST_REGEX = '([\\+\\-\\*/=]=)'
ASSIGNMENT_REGEX = '('+REG_REGEX.format('reg_dst_1') + ' *' + ADJUST_REGEX + ' *('+NUMBER_REGEX+'|'+REG_REGEX.format('reg_src_1')+r'|(\[)'+REG_REGEX.format('reg_src_2')+r'(\])))'
POP_REGEX = '((pop) +'+REG_REGEX.format('reg_dst_2')+')'
CONSTRAINT_REGEX = '(' + ASSIGNMENT_REGEX + '|' + POP_REGEX + ')'
testcases/test_general.py
+2 -2
View File
@@ -84,7 +84,7 @@ class GeneralTests(unittest.TestCase):
if version_info.major == 3 and version_info.minor >= 2:
# Wrong question mark position
with self.assertRaisesRegex(RopperError,'A \? for the highest 4 bit of a byte is not supported.*'):
with self.assertRaisesRegex(RopperError,r'A \? for the highest 4 bit of a byte is not supported.*'):
self.rs.searchOpcode('ff?4')
# Wrong lengh
with self.assertRaisesRegex(RopperError,'The length of the opcode has to be a multiple of two'):
@@ -94,7 +94,7 @@ class GeneralTests(unittest.TestCase):
self.rs.searchOpcode('ff4r')
else:
# Wrong question mark position
with self.assertRaisesRegexp(RopperError,'A \? for the highest 4 bit of a byte is not supported.*'):
with self.assertRaisesRegexp(RopperError,r'A \? for the highest 4 bit of a byte is not supported.*'):
self.rs.searchOpcode('ff?4')
# Wrong lengh
with self.assertRaisesRegexp(RopperError,'The length of the opcode has to be a multiple of two'):