pythongh-95355: Check tokens[0] after allocating memory (pythonGH-95356)

imzhuhl · web-flow · commit b946f529efb4 · 2022-07-28T03:00:34.000-07:00
python#95355 Automerge-Triggered-By: GH:pablogsal
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
@@ -0,0 +1 @@
+``_PyPegen_Parser_New`` now properly detects token memory allocation errors. Patch by Honglin Zhu.
diff --git a/Parser/pegen.c b/Parser/pegen.c
@@ -738,7 +738,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
         return (Parser *) PyErr_NoMemory();
     }
     p->tokens[0] = PyMem_Calloc(1, sizeof(Token));
-    if (!p->tokens) {
+    if (!p->tokens[0]) {
         PyMem_Free(p->tokens);
         PyMem_Free(p);
         return (Parser *) PyErr_NoMemory();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+``_PyPegen_Parser_New`` now properly detects token memory allocation errors. Patch by Honglin Zhu.
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,`
`738`	`738`	`return (Parser *) PyErr_NoMemory();`
`739`	`739`	`}`
`740`	`740`	`p->tokens[0] = PyMem_Calloc(1, sizeof(Token));`
`741`		`- if (!p->tokens) {`
	`741`	`+ if (!p->tokens[0]) {`
`742`	`742`	`PyMem_Free(p->tokens);`
`743`	`743`	`PyMem_Free(p);`
`744`	`744`	`return (Parser *) PyErr_NoMemory();`