Skip to content

gh-101955: Fix SystemError in possesive quantifier with alternative and group #111362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 18, 2024
Merged

gh-101955: Fix SystemError in possesive quantifier with alternative and group #111362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34d364b
gh-101955: Fix SystemError in possesive quantifier with alternative a…
serhiy-storchaka Oct 26, 2023
e1ff052
Merge branch 'main' into re-possesive-alternative-and-group
serhiy-storchaka Nov 12, 2024
169aed1
Merge branch 'main' into re-possesive-alternative-and-group
serhiy-storchaka Nov 18, 2024
273e2d1
Simplify code.
serhiy-storchaka Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Lib/test/test_re.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,6 +2640,12 @@ def test_bug_gh100061(self):
self.assertEqual(re.match("(?>(?:ab?c){1,3})", "aca").span(), (0, 2))
self.assertEqual(re.match("(?:ab?c){1,3}+", "aca").span(), (0, 2))

def test_bug_gh101955(self):
# Possessive quantifier with nested alternative with capture groups
self.assertEqual(re.match('((x)|y|z)*+', 'xyz').groups(), ('z', 'x'))
self.assertEqual(re.match('((x)|y|z){3}+', 'xyz').groups(), ('z', 'x'))
self.assertEqual(re.match('((x)|y|z){3,}+', 'xyz').groups(), ('z', 'x'))

@unittest.skipIf(multiprocessing is None, 'test requires multiprocessing')
def test_regression_gh94675(self):
pattern = re.compile(r'(?<=[({}])(((//[^\n]*)?[\n])([\000-\040])*)*'
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-10-26-16-36-22.gh-issue-101955.Ixu3IF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix SystemError when match regular expression pattern containing some
combination of possessive quantifier, alternative and capture group.
18 changes: 18 additions & 0 deletions Modules/_sre/sre_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,17 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)
pointer */
state->ptr = ptr;

/* Set state->repeat to non-NULL */
ctx->u.rep = repeat_pool_malloc(state);
if (!ctx->u.rep) {
RETURN_ERROR(SRE_ERROR_MEMORY);
}
ctx->u.rep->count = -1;
ctx->u.rep->pattern = NULL;
ctx->u.rep->prev = state->repeat;
ctx->u.rep->last_ptr = NULL;
state->repeat = ctx->u.rep;

/* Initialize Count to 0 */
ctx->count = 0;

Expand All @@ -1320,6 +1331,9 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)
}
else {
state->ptr = ptr;
/* Restore state->repeat */
state->repeat = ctx->u.rep->prev;
repeat_pool_free(state, ctx->u.rep);
RETURN_FAILURE;
}
}
Expand Down Expand Up @@ -1392,6 +1406,10 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)
}
}

/* Restore state->repeat */
state->repeat = ctx->u.rep->prev;
repeat_pool_free(state, ctx->u.rep);

/* Evaluate Tail */
/* Jump to end of pattern indicated by skip, and then skip
the SUCCESS op code that follows it. */
Expand Down
Loading