gh-95355: Check tokens[0] after allocating memory (GH-95356)

miss-islington · imzhuhl · web-flow · commit d3cc99bdce26 · 2022-07-28T03:29:50.000-07:00
GH-95355 Automerge-Triggered-By: GH:pablogsal (cherry picked from commit b946f52) Co-authored-by: Honglin Zhu <zhuhonglin.zhl@alibaba-inc.com>
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
@@ -744,7 +744,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
`@@ -744,7 +744,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,`
`744`	`744`	`return (Parser *) PyErr_NoMemory();`
`745`	`745`	`}`
`746`	`746`	`p->tokens[0] = PyMem_Calloc(1, sizeof(Token));`
`747`		`- if (!p->tokens) {`
	`747`	`+ if (!p->tokens[0]) {`
`748`	`748`	`PyMem_Free(p->tokens);`
`749`	`749`	`PyMem_Free(p);`
`750`	`750`	`return (Parser *) PyErr_NoMemory();`