Commitc2c18ac

and

authored

[3.13]gh-101955: Fix SystemError in possesive quantifier with alternative and group (GH-111362) (GH-126962)

(cherry picked from commitf9c5573)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parent885386b commitc2c18acCopy full SHA for c2c18ac

File tree

+26

-0

lines changed

+26

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2641,6 +2641,12 @@ def test_bug_gh100061(self):`
`2641`	`2641`	`self.assertEqual(re.match("(?>(?:ab?c){1,3})","aca").span(), (0,2))`
`2642`	`2642`	`self.assertEqual(re.match("(?:ab?c){1,3}+","aca").span(), (0,2))`
`2643`	`2643`
	`2644`	`+deftest_bug_gh101955(self):`
	`2645`	`+# Possessive quantifier with nested alternative with capture groups`
	`2646`	`+self.assertEqual(re.match('((x)\|y\|z)*+','xyz').groups(), ('z','x'))`
	`2647`	`+self.assertEqual(re.match('((x)\|y\|z){3}+','xyz').groups(), ('z','x'))`
	`2648`	`+self.assertEqual(re.match('((x)\|y\|z){3,}+','xyz').groups(), ('z','x'))`
	`2649`	`+`
`2644`	`2650`	`@unittest.skipIf(multiprocessingisNone,'test requires multiprocessing')`
`2645`	`2651`	`deftest_regression_gh94675(self):`
`2646`	`2652`	`pattern=re.compile(r'(?<=[({}])(((//[^\n])?[\n])([\000-\040]))*'`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix SystemError when match regular expression pattern containing some`
	`2`	`+combination of possessive quantifier, alternative and capture group.`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1306,6 +1306,17 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)`
`1306`	`1306`	`pointer */`
`1307`	`1307`	`state->ptr=ptr;`
`1308`	`1308`
	`1309`	`+/* Set state->repeat to non-NULL */`
	`1310`	`+ctx->u.rep=repeat_pool_malloc(state);`
	`1311`	`+if (!ctx->u.rep) {`
	`1312`	`+RETURN_ERROR(SRE_ERROR_MEMORY);`
	`1313`	`+ }`
	`1314`	`+ctx->u.rep->count=-1;`
	`1315`	`+ctx->u.rep->pattern=NULL;`
	`1316`	`+ctx->u.rep->prev=state->repeat;`
	`1317`	`+ctx->u.rep->last_ptr=NULL;`
	`1318`	`+state->repeat=ctx->u.rep;`
	`1319`	`+`
`1309`	`1320`	`/* Initialize Count to 0 */`
`1310`	`1321`	`ctx->count=0;`
`1311`	`1322`
`@@ -1320,6 +1331,9 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)`
`1320`	`1331`	`}`
`1321`	`1332`	`else {`
`1322`	`1333`	`state->ptr=ptr;`
	`1334`	`+/* Restore state->repeat */`
	`1335`	`+state->repeat=ctx->u.rep->prev;`
	`1336`	`+repeat_pool_free(state,ctx->u.rep);`
`1323`	`1337`	`RETURN_FAILURE;`
`1324`	`1338`	`}`
`1325`	`1339`	`}`
`@@ -1392,6 +1406,10 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)`
`1392`	`1406`	`}`
`1393`	`1407`	`}`
`1394`	`1408`
	`1409`	`+/* Restore state->repeat */`
	`1410`	`+state->repeat=ctx->u.rep->prev;`
	`1411`	`+repeat_pool_free(state,ctx->u.rep);`
	`1412`	`+`
`1395`	`1413`	`/* Evaluate Tail */`
`1396`	`1414`	`/* Jump to end of pattern indicated by skip, and then skip`
`1397`	`1415`	`the SUCCESS op code that follows it. */`

Comments

(0)