Skip to content

C
cpython
Commit be733ee7 authored by Gustavo Niemeyer's avatar Gustavo Niemeyer
Browse files
Options

More work on bug #672491 and patch #712900. 

I've applied a modified version of Greg Chapman's patch. I've included
the fixes without introducing the reorganization mentioned, for the sake
of stability. Also, the second fix mentioned in the patch don't fix the
mentioned problem anymore, because of the change introduced by patch
#720991 (by Greg as well). The new fix wasn't complicated though, and is
included as well.

As a note. It seems that there are other places that require the
"protection" of LASTMARK_SAVE()/LASTMARK_RESTORE(), and are just waiting
for someone to find how to break them. Particularly, I belive that every
recursion of SRE_MATCH() should be protected by these macros. I won't
do that right now since I'm not completely sure about this, and we don't
have much time for testing until the next release.
parent 48f3dcc9
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 24 deletions
Lib/test/re_tests.py
View file @ be733ee7
......@@ -655,6 +655,10 @@ xyzabc
(r'^a*?$', 'foo', FAIL),
# bug 470582: nested groups problem
(r'^((a)c)?(ab)$', 'ab', SUCCEED, 'g1+"-"+g2+"-"+g3', 'None-None-ab'),
# another minimizing repeat problem (capturing groups in assertions)
('^([ab]*?)(?=(b)?)c', 'abc', SUCCEED, 'g1+"-"+g2', 'ab-None'),
('^([ab]*?)(?!(b))c', 'abc', SUCCEED, 'g1+"-"+g2', 'ab-None'),
('^([ab]*?)(?<!(a))c', 'abc', SUCCEED, 'g1+"-"+g2', 'ab-None'),
]
try:
......
Lib/test/test_sre.py
View file @ be733ee7
......@@ -78,10 +78,12 @@ test(r"""sre.match(r'(a)|(b)', 'b').start(1)""", -1)
test(r"""sre.match(r'(a)|(b)', 'b').end(1)""", -1)
test(r"""sre.match(r'(a)|(b)', 'b').span(1)""", (-1, -1))
# bug described in patch 527371
# bug described in patches 527371/672491
test(r"""sre.match(r'(a)?a','a').lastindex""", None)
test(r"""sre.match(r'(a)(b)?b','ab').lastindex""", 1)
test(r"""sre.match(r'(?P<a>a)(?P<b>b)?b','ab').lastgroup""", 'a')
test(r"""sre.match("(?P<a>a(b))", "ab").lastgroup""", 'a')
test(r"""sre.match("((a))", "a").lastindex""", 1)
# bug 545855 -- This pattern failed to cause a compile error as it
# should, instead provoking a TypeError.
......
Modules/_sre.c
View file @ be733ee7
......@@ -337,19 +337,6 @@ mark_restore(SRE_STATE* state, int lo, int hi)
return 0;
}
static void
lastmark_restore(SRE_STATE *state, int lastmark)
{
if (state->lastmark > lastmark) {
memset(
state->mark + lastmark + 1, 0,
(state->lastmark - lastmark) * sizeof(void*)
);
state->lastmark = lastmark;
state->lastindex = (lastmark == 0) ? -1 : (lastmark-1)/2+1;
}
}
/* generate 8-bit version */
#define SRE_CHAR unsigned char
......@@ -690,6 +677,22 @@ SRE_INFO(SRE_STATE* state, SRE_CODE* pattern)
}
#endif
/* macros to preserve lastmark in case of backtracking */
#define LASTMARK_SAVE() \
do { \
lastmark = state->lastmark; \
lastindex = state->lastindex; \
} while (0)
#define LASTMARK_RESTORE() \
do { \
if (state->lastmark > lastmark) { \
memset(state->mark + lastmark + 1, 0, \
(state->lastmark - lastmark) * sizeof(void*)); \
state->lastmark = lastmark; \
state->lastindex = lastindex; \
} \
} while (0)
LOCAL(int)
SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
{
......@@ -700,7 +703,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
SRE_CHAR* ptr = state->ptr;
int i, count;
SRE_REPEAT* rp;
int lastmark;
int lastmark, lastindex;
SRE_CODE chr;
SRE_REPEAT rep; /* FIXME: <fl> allocate in STATE instead */
......@@ -927,7 +930,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* alternation */
/* <BRANCH> <0=skip> code <JUMP> ... <NULL> */
TRACE(("|%p|%p|BRANCH\n", pattern, ptr));
lastmark = state->lastmark;
LASTMARK_SAVE();
for (; pattern[0]; pattern += pattern[0]) {
if (pattern[1] == SRE_OP_LITERAL &&
(ptr >= end || (SRE_CODE) *ptr != pattern[2]))
......@@ -939,7 +942,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
i = SRE_MATCH(state, pattern + 1, level + 1);
if (i)
return i;
lastmark_restore(state, lastmark);
LASTMARK_RESTORE();
}
return 0;
......@@ -979,8 +982,11 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* tail is empty. we're finished */
state->ptr = ptr;
return 1;
}
LASTMARK_SAVE();
} else if (pattern[pattern[0]] == SRE_OP_LITERAL) {
if (pattern[pattern[0]] == SRE_OP_LITERAL) {
/* tail starts with a literal. skip positions where
the rest of the pattern cannot possibly match */
chr = pattern[pattern[0]+1];
......@@ -998,11 +1004,11 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
return i;
ptr--;
count--;
LASTMARK_RESTORE();
}
} else {
/* general case */
lastmark = state->lastmark;
while (count >= (int) pattern[1]) {
state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1);
......@@ -1010,7 +1016,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
return i;
ptr--;
count--;
lastmark_restore(state, lastmark);
LASTMARK_RESTORE();
}
}
return 0;
......@@ -1055,7 +1061,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* general case */
int matchmax = ((int)pattern[2] == 65535);
int c;
lastmark = state->lastmark;
LASTMARK_SAVE();
while (matchmax || count <= (int) pattern[2]) {
state->ptr = ptr;
i = SRE_MATCH(state, pattern + pattern[0], level + 1);
......@@ -1065,13 +1071,13 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
c = SRE_COUNT(state, pattern+3, 1, level+1);
if (c < 0)
return c;
LASTMARK_RESTORE();
if (c == 0)
break;
assert(c == 1);
ptr++;
count++;
}
lastmark_restore(state, lastmark);
}
return 0;
......@@ -1113,6 +1119,8 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
TRACE(("|%p|%p|MAX_UNTIL %d\n", pattern, ptr, count));
LASTMARK_SAVE();
if (count < rp->pattern[1]) {
/* not enough matches */
rp->count = count;
......@@ -1122,6 +1130,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
return i;
rp->count = count - 1;
state->ptr = ptr;
LASTMARK_RESTORE();
return 0;
}
......@@ -1129,7 +1138,6 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
/* we may have enough matches, but if we can
match another item, do so */
rp->count = count;
lastmark = state->lastmark;
i = mark_save(state, 0, lastmark);
if (i < 0)
return i;
......@@ -1138,7 +1146,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
if (i)
return i;
i = mark_restore(state, 0, lastmark);
state->lastmark = lastmark;
LASTMARK_RESTORE();
if (i < 0)
return i;
rp->count = count - 1;
......@@ -1182,6 +1190,8 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
return 0;
}
LASTMARK_SAVE();
/* see if the tail matches */
state->repeat = rp->prev;
i = SRE_MATCH(state, pattern, level + 1);
......@@ -1191,6 +1201,8 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
state->ptr = ptr;
state->repeat = rp;
LASTMARK_RESTORE();
if (count >= rp->pattern[2] && rp->pattern[2] != 65535)
return 0;
......@@ -3084,3 +3096,6 @@ PyMODINIT_FUNC init_sre(void)
}
#endif /* !defined(SRE_RECURSIVE) */
/* vim:ts=4:sw=4:et
*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7