NotificationsYou must be signed in to change notification settings
Fork33.7k
Star70.4k

[3.10] gh-98740: Fix validation of conditional expressions in RE (GH-98764)#99046

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Merged

serhiy-storchaka merged 1 commit intopython:3.10fromserhiy-storchaka:backport-e9ac890-3.10

Nov 3, 2022

Merged

[3.10] gh-98740: Fix validation of conditional expressions in RE (GH-98764)#99046

serhiy-storchaka merged 1 commit intopython:3.10fromserhiy-storchaka:backport-e9ac890-3.10

Nov 3, 2022

Conversation

Copy link

Member

serhiy-storchaka commentedNov 3, 2022•
edited by bedevere-bot
Loading

In very rare circumstances the JUMP opcode could be confused with the argument of the opcode in the "then" part which doesn't end with the JUMP opcode. This led to incorrect detection of the final JUMP opcode and incorrect calculation of the size of the subexpression.

NOTE: Changed return value of functions _validate_inner() and _validate_charset() in Modules/_sre/sre.c. Now they return 0 on success, -1 on failure, and 1 if the last op is JUMP (which usually is a failure). Previously they returned 1 on success and 0 on failure..
(cherry picked from commite9ac890)

Issue:Python 3.11re.compile raises SRE code error for valid regex. #98740

[3.10]pythongh-98740: Fix validation of conditional expressions in RE (

c2d02e9

pythonGH-98764)In very rare circumstances the JUMP opcode could be confused with theargument of the opcode in the "then" part which doesn't end with theJUMP opcode. This led to incorrect detection of the final JUMP opcodeand incorrect calculation of the size of the subexpression.NOTE: Changed return value of functions _validate_inner() and_validate_charset() in Modules/_sre/sre.c.  Now they return 0 on success,-1 on failure, and 1 if the last op is JUMP (which usually is a failure).Previously they returned 1 on success and 0 on failure..(cherry picked from commite9ac890)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>