Skip to content

bpo-46110: Add a recursion check to avoid stack overflow in the PEG parser#30177

Merged
pablogsal merged 3 commits intopython:mainfrom
pablogsal:bpo-46110
Dec 20, 2021
Merged

bpo-46110: Add a recursion check to avoid stack overflow in the PEG parser#30177
pablogsal merged 3 commits intopython:mainfrom
pablogsal:bpo-46110

Conversation

@pablogsal
Copy link
Copy Markdown
Member

@pablogsal pablogsal commented Dec 18, 2021 •
edited by bedevere-bot
Loading

@pablogsal pablogsal marked this pull request as draft December 18, 2021 02:38
pablogsal
pablogsal commented Dec 18, 2021
View reviewed changes
@ned-deily ned-deily changed the title bpo-6110: Add a recursion check to avoid stack overflow in the PEG parser bpo-46110: Add a recursion check to avoid stack overflow in the PEG parser Dec 18, 2021
isidentical
isidentical approved these changes Dec 18, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@isidentical isidentical left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pablogsal @isidentical
Update Lib/test/test_syntax.py
8229e04 
Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>
@cmcmarrow
Copy link
Copy Markdown

cmcmarrow commented Dec 18, 2021

thanks for the PR!

@pablogsal pablogsal marked this pull request as ready for review December 19, 2021 00:31
@pablogsal pablogsal marked this pull request as draft December 19, 2021 01:22
@pablogsal
Copy link
Copy Markdown
Member Author

pablogsal commented Dec 19, 2021 •
edited
Loading

Unfortunately, I am not still convinced about this since 1700 frames are reached easily with 60 or so parentheses while currently the maximum allowed parentheses is reached at 5560 frames.

@pablogsal pablogsal marked this pull request as ready for review December 19, 2021 01:33
@pablogsal pablogsal added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 19, 2021
@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 19, 2021
@pablogsal pablogsal added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 19, 2021
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Dec 19, 2021

🤖 New build scheduled with the buildbot fleet by @pablogsal for commit a050033f543db8fa9ed36ee81798fcbeb72f7116 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 19, 2021
@python python deleted a comment from bedevere-bot Dec 19, 2021
@pablogsal pablogsal added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 19, 2021
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Dec 19, 2021

🤖 New build scheduled with the buildbot fleet by @pablogsal for commit 5270ebc 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 19, 2021
@pablogsal pablogsal merged commit e9898bf into python:main Dec 20, 2021
@pablogsal pablogsal deleted the bpo-46110 branch December 20, 2021 15:43
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 20, 2021

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 20, 2021

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 20, 2021

Sorry @pablogsal, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker e9898bf153d26059261ffef11f7643ae991e2a4c 3.10

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Dec 20, 2021

Sorry, @pablogsal, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker e9898bf153d26059261ffef11f7643ae991e2a4c 3.9

pablogsal added a commit to pablogsal/cpython that referenced this pull request Dec 20, 2021
@pablogsal
[3.10] bpo-46110: Add a recursion check to avoid stack overflow in th…
17a8902 
…e PEG parser (pythonGH-30177)

Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>.
(cherry picked from commit e9898bf)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Dec 20, 2021

GH-30214 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Dec 20, 2021
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Dec 20, 2021

GH-30215 is a backport of this pull request to the 3.9 branch.

pablogsal added a commit that referenced this pull request Dec 20, 2021
@pablogsal
[3.10] bpo-46110: Add a recursion check to avoid stack overflow in th…
dc73199 
…e PEG parser (GH-30177) (GH-30214)

Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>.
(cherry picked from commit e9898bf)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
pablogsal added a commit to pablogsal/cpython that referenced this pull request Dec 20, 2021
@pablogsal
[3.9] bpo-46110: Add a recursion check to avoid stack overflow in the…
02075f8 
… PEG parser (pythonGH-30177)

Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>.
(cherry picked from commit e9898bf)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
pablogsal added a commit that referenced this pull request Dec 20, 2021
@pablogsal
[3.9] bpo-46110: Add a recursion check to avoid stack overflow in the…
e5cf31d 
… PEG parser (GH-30177) (#30215)

Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>.
(cherry picked from commit e9898bf)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
brandtbucher pushed a commit to brandtbucher/cpython that referenced this pull request Dec 27, 2021
@pablogsal @isidentical @brandtbucher
bpo-46110: Add a recursion check to avoid stack overflow in the PEG p…
a248ef4 
…arser (pythonGH-30177)

Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>
pablogsal added a commit that referenced this pull request Jan 3, 2022
@pablogsal
Revert "bpo-46110: Add a recursion check to avoid stack overflow in t…
cb6b6a4 
…he PEG parser (GH-30177)"

This reverts commit e9898bf.
@pablogsal pablogsal mentioned this pull request Jan 3, 2022
Merged
pablogsal added a commit that referenced this pull request Jan 3, 2022
@pablogsal
Revert "bpo-46110: Add a recursion check to avoid stack overflow in t…
9d35ded 
…he PEG parser (GH-30177)" (GH-30363)

This reverts commit e9898bf temporarily as we want to confirm if this commit is the cause of a slowdown at startup time.
pablogsal added a commit that referenced this pull request Jan 3, 2022
@pablogsal
Revert "Revert "bpo-46110: Add a recursion check to avoid stack overf…
6d88c30 
…low in the PEG parser (GH-30177)" (GH-30363)"

This reverts commit 9d35ded.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@isidentical isidentical isidentical approved these changes

@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou lysnikolaou is a code owner

Assignees

@pablogsal pablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@pablogsal @cmcmarrow @bedevere-bot @miss-islington @isidentical @the-knights-who-say-ni