diff options
| -rw-r--r-- | Lib/test/test_re.py | 4 | ||||
| -rw-r--r-- | Modules/_sre.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 6ee84c62af..8229d4a98f 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -91,6 +91,10 @@ class ReTests(unittest.TestCase): self.assertRaises(ValueError, re.findall, pattern, 'A', re.I) self.assertRaises(ValueError, re.compile, pattern, re.I) + def test_bug_3629(self): + # A regex that triggered a bug in the sre-code validator + re.compile("(?P<quote>)(?(quote))") + def test_sub_template_numeric_escape(self): # bug 776311 and friends self.assertEqual(re.sub('x', r'\0', 'x'), '\0') diff --git a/Modules/_sre.c b/Modules/_sre.c index 2a54d8e603..823dc50509 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -2780,17 +2780,18 @@ _compile(PyObject* self_, PyObject* args) arg = *code++; \ VTRACE(("%lu (arg)\n", (unsigned long)arg)); \ } while (0) -#define GET_SKIP \ +#define GET_SKIP_ADJ(adj) \ do { \ VTRACE(("%p= ", code)); \ if (code >= end) FAIL; \ skip = *code; \ VTRACE(("%lu (skip to %p)\n", \ (unsigned long)skip, code+skip)); \ - if (code+skip < code || code+skip > end) \ + if (code+skip-adj < code || code+skip-adj > end)\ FAIL; \ code++; \ } while (0) +#define GET_SKIP GET_SKIP_ADJ(0) static int _validate_charset(SRE_CODE *code, SRE_CODE *end) @@ -3097,7 +3098,7 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups) GET_ARG; if (arg >= groups) FAIL; - GET_SKIP; + GET_SKIP_ADJ(1); code--; /* The skip is relative to the first arg! */ /* There are two possibilities here: if there is both a 'then' part and an 'else' part, the generated code looks like: |