mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>
This commit is contained in:
Pablo Galindo Salgado 2021-12-20 15:43:26 +00:00 • committed by GitHub
parent 6ca78affc8
commit e9898bf153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4602 additions and 3197 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Tools/peg_generator/pegen/c_generator.py
View file

@ -37,6 +37,8 @@ EXTENSION_PREFIX = """\
# define D(x)
#endif
# define MAXSTACK 6000
"""
@ -364,10 +366,14 @@ class CParserGenerator(ParserGenerator, GrammarVisitor):
self.skip_actions = skip_actions
def add_level(self) -> None:
self.print("D(p->level++);")
self.print("if (p->level++ == MAXSTACK) {")
with self.indent():
self.print("p->error_indicator = 1;")
self.print("PyErr_NoMemory();")
self.print("}")
def remove_level(self) -> None:
self.print("D(p->level--);")
self.print("p->level--;")
def add_return(self, ret_val: str) -> None:
self.remove_level()
@ -544,9 +550,10 @@ class CParserGenerator(ParserGenerator, GrammarVisitor):
self.print("p->in_raw_rule++;")
self.print(f"void *_raw = {node.name}_raw(p);")
self.print("p->in_raw_rule--;")
self.print("if (p->error_indicator)")
self.print("if (p->error_indicator) {")
with self.indent():
self.print("return NULL;")
self.add_return("NULL")
self.print("}")
self.print("if (_raw == NULL || p->mark <= _resmark)")
with self.indent():
self.print("break;")