From 81fc223d441d9c2b09705e273ce6790497a03d85 Mon Sep 17 00:00:00 2001 From: Long Le Date: Fri, 7 Jun 2013 16:46:25 +0700 Subject: [PATCH] - Fix regex error in utils.cyclic_pattern_search() and possible in PEDACmd.strings() --- lib/utils.py | 2 +- peda.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils.py b/lib/utils.py index d9a2fc9..abfdc20 100644 --- a/lib/utils.py +++ b/lib/utils.py @@ -677,7 +677,7 @@ def cyclic_pattern_search(buf): result = [] pattern = cyclic_pattern() - p = re.compile("[%s]{4,}" % ("".join(cyclic_pattern_charset()))) + p = re.compile("[%s]{4,}" % re.escape(cyclic_pattern_charset())) found = p.finditer(buf) found = list(found) for m in found: diff --git a/peda.py b/peda.py index de8a662..2e203a3 100644 --- a/peda.py +++ b/peda.py @@ -4729,7 +4729,7 @@ class PEDACmd(object): return text = "" - p = re.compile("[%s]{%d,}" % (string.printable, minlen)) + p = re.compile("[%s]{%d,}" % (re.escape(string.printable), minlen)) for (start, end, _, _) in maps: mem = peda.dumpmem(start, end) if not mem: continue