Skip to content

gh-149689: add missing error checks in Parser/action_helpers.c #149710

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
KowalskiThomas wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −13
Open

gh-149689: add missing error checks in Parser/action_helpers.c #149710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c361f
fix: add missing error checks
KowalskiThomas May 11, 2026
2285902
misc: add news entry
KowalskiThomas May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-05-11-15-58-23.gh-issue-149689.9Ht49z.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix missing error propagation in parser action helpers when memory allocation
fails. Patch by Thomas Kowalski.
60 changes: 47 additions & 13 deletions Parser/action_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,11 @@ _set_seq_context(Parser *p, asdl_expr_seq *seq, expr_context_ty ctx)
}
for (Py_ssize_t i = 0; i < len; i++) {
expr_ty e = asdl_seq_GET(seq, i);
asdl_seq_SET(new_seq, i, _PyPegen_set_expr_context(p, e, ctx));
expr_ty new_e = _PyPegen_set_expr_context(p, e, ctx);
if (!new_e) {
return NULL;
}
asdl_seq_SET(new_seq, i, new_e);
}
return new_seq;
}
Expand All @@ -268,19 +272,21 @@ _set_name_context(Parser *p, expr_ty e, expr_context_ty ctx)
static expr_ty
_set_tuple_context(Parser *p, expr_ty e, expr_context_ty ctx)
{
return _PyAST_Tuple(
_set_seq_context(p, e->v.Tuple.elts, ctx),
ctx,
EXTRA_EXPR(e, e));
asdl_expr_seq *seq = _set_seq_context(p, e->v.Tuple.elts, ctx);
if (!seq && PyErr_Occurred()) {
return NULL;
}
return _PyAST_Tuple(seq, ctx, EXTRA_EXPR(e, e));
}

static expr_ty
_set_list_context(Parser *p, expr_ty e, expr_context_ty ctx)
{
return _PyAST_List(
_set_seq_context(p, e->v.List.elts, ctx),
ctx,
EXTRA_EXPR(e, e));
asdl_expr_seq *seq = _set_seq_context(p, e->v.List.elts, ctx);
if (!seq && PyErr_Occurred()) {
return NULL;
}
return _PyAST_List(seq, ctx, EXTRA_EXPR(e, e));
}

static expr_ty
Expand All @@ -300,8 +306,11 @@ _set_attribute_context(Parser *p, expr_ty e, expr_context_ty ctx)
static expr_ty
_set_starred_context(Parser *p, expr_ty e, expr_context_ty ctx)
{
return _PyAST_Starred(_PyPegen_set_expr_context(p, e->v.Starred.value, ctx),
ctx, EXTRA_EXPR(e, e));
expr_ty inner = _PyPegen_set_expr_context(p, e->v.Starred.value, ctx);
if (!inner) {
return NULL;
}
return _PyAST_Starred(inner, ctx, EXTRA_EXPR(e, e));
}

/* Creates an `expr_ty` equivalent to `expr` but with `ctx` as context */
Expand Down Expand Up @@ -1168,7 +1177,14 @@ expr_ty _PyPegen_collect_call_seqs(Parser *p, asdl_expr_seq *a, asdl_seq *b,
}

asdl_expr_seq *starreds = _PyPegen_seq_extract_starred_exprs(p, b);
if (!starreds && PyErr_Occurred()) {
return NULL;
}

asdl_keyword_seq *keywords = _PyPegen_seq_delete_starred_exprs(p, b);
if (!keywords && PyErr_Occurred()) {
return NULL;
}

if (starreds) {
total_len += asdl_seq_LEN(starreds);
Expand Down Expand Up @@ -1416,6 +1432,9 @@ expr_ty
_PyPegen_template_str(Parser *p, Token *a, asdl_expr_seq *raw_expressions, Token *b) {

asdl_expr_seq *resized_exprs = _get_resized_exprs(p, a, raw_expressions, b, TSTRING);
if (!resized_exprs && PyErr_Occurred()) {
Copy link
Copy Markdown
Contributor

@eendebakpt eendebakpt May 12, 2026

Choose a reason for hiding this comment

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

The && PyErr_Occurred() is redundant here, but is not hurting either.

return NULL;
}
return _PyAST_TemplateStr(resized_exprs, a->lineno, a->col_offset,
b->end_lineno, b->end_col_offset,
p->arena);
Expand All @@ -1425,6 +1444,9 @@ expr_ty
_PyPegen_joined_str(Parser *p, Token* a, asdl_expr_seq* raw_expressions, Token*b) {

asdl_expr_seq *resized_exprs = _get_resized_exprs(p, a, raw_expressions, b, FSTRING);
if (!resized_exprs && PyErr_Occurred()) {
return NULL;
}
return _PyAST_JoinedStr(resized_exprs, a->lineno, a->col_offset,
b->end_lineno, b->end_col_offset,
p->arena);
Expand Down Expand Up @@ -1574,7 +1596,7 @@ expr_ty _PyPegen_interpolation(Parser *p, expr_ty expression, Token *debug, Resu
end_col_offset, arena
);

if (!debug) {
if (!interpolation || !debug) {
return interpolation;
}

Expand All @@ -1585,6 +1607,9 @@ expr_ty _PyPegen_interpolation(Parser *p, expr_ty expression, Token *debug, Resu
}

asdl_expr_seq *values = _Py_asdl_expr_seq_new(2, arena);
if (!values) {
return NULL;
}
asdl_seq_SET(values, 0, debug_text);
asdl_seq_SET(values, 1, interpolation);
return _PyAST_JoinedStr(values, lineno, col_offset, debug_end_line, debug_end_offset, p->arena);
Expand All @@ -1601,7 +1626,7 @@ expr_ty _PyPegen_formatted_value(Parser *p, expr_ty expression, Token *debug, Re
end_col_offset, arena
);

if (!debug) {
if (!formatted_value || !debug) {
return formatted_value;
}

Expand Down Expand Up @@ -1631,6 +1656,9 @@ expr_ty _PyPegen_formatted_value(Parser *p, expr_ty expression, Token *debug, Re
}

asdl_expr_seq *values = _Py_asdl_expr_seq_new(2, arena);
if (!values) {
return NULL;
}
asdl_seq_SET(values, 0, debug_text);
asdl_seq_SET(values, 1, formatted_value);
return _PyAST_JoinedStr(values, lineno, col_offset, debug_end_line, debug_end_offset, p->arena);
Expand Down Expand Up @@ -1898,6 +1926,9 @@ _build_concatenated_joined_str(Parser *p, asdl_expr_seq *strings,
{
asdl_expr_seq *values = _build_concatenated_str(p, strings, lineno,
col_offset, end_lineno, end_col_offset, arena);
if (!values) {
return NULL;
}
return _PyAST_JoinedStr(values, lineno, col_offset, end_lineno, end_col_offset, p->arena);
}

Expand All @@ -1908,6 +1939,9 @@ _PyPegen_concatenate_tstrings(Parser *p, asdl_expr_seq *strings,
{
asdl_expr_seq *values = _build_concatenated_str(p, strings, lineno,
col_offset, end_lineno, end_col_offset, arena);
if (!values) {
return NULL;
}
return _PyAST_TemplateStr(values, lineno, col_offset, end_lineno,
end_col_offset, arena);
}
Expand Down
Loading