[3.11] pythongh-105375: Improve error handling in compiler_enter_scop…

…e() (python#105494)
erlend-aasland · Jun 9, 2023 · 73d4a26 · 73d4a26
1 parent c28887d
commit 73d4a26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-06-08-09-54-37.gh-issue-105375.kqKT3E.rst b/Misc/NEWS.d/next/Core and Builtins/2023-06-08-09-54-37.gh-issue-105375.kqKT3E.rst
@@ -0,0 +1 @@
+Fix bug in the compiler where an exception could end up being overwritten.
diff --git a/Python/compile.c b/Python/compile.c
@@ -1736,8 +1736,12 @@ compiler_enter_scope(struct compiler *c, identifier name,
  Py_INCREF(name);
  u->u_name = name;
  u->u_varnames = list2dict(u->u_ste->ste_varnames);
+ if (!u->u_varnames) {
+ compiler_unit_free(u);
+ return ERROR;
+ }
  u->u_cellvars = dictbytype(u->u_ste->ste_symbols, CELL, 0, 0);
- if (!u->u_varnames || !u->u_cellvars) {
+ if (!u->u_cellvars) {
  compiler_unit_free(u);
  return 0;
  }