Skip to content

[3.12] Check the result of PySet_Contains() for error in Python/symtable.c (GH-109146) #109153

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

Merged
merged 1 commit into from
Oct 2, 2023
Merged

[3.12] Check the result of PySet_Contains() for error in Python/symtable.c (GH-109146) #109153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 57 additions & 15 deletions Python/symtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
PyObject *bound, PyObject *local, PyObject *free,
PyObject *global, PyObject *type_params, PySTEntryObject *class_entry)
{
int contains;
if (flags & DEF_GLOBAL) {
if (flags & DEF_NONLOCAL) {
PyErr_Format(PyExc_SyntaxError,
Expand All @@ -543,14 +544,22 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
"nonlocal declaration not allowed at module level");
return error_at_directive(ste, name);
}
if (!PySet_Contains(bound, name)) {
contains = PySet_Contains(bound, name);
if (contains < 0) {
return 0;
}
if (!contains) {
PyErr_Format(PyExc_SyntaxError,
"no binding for nonlocal '%U' found",
name);

return error_at_directive(ste, name);
}
if (PySet_Contains(type_params, name)) {
contains = PySet_Contains(type_params, name);
if (contains < 0) {
return 0;
}
if (contains) {
PyErr_Format(PyExc_SyntaxError,
"nonlocal binding not allowed for type parameter '%U'",
name);
Expand Down Expand Up @@ -599,17 +608,29 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
Note that having a non-NULL bound implies that the block
is nested.
*/
if (bound && PySet_Contains(bound, name)) {
SET_SCOPE(scopes, name, FREE);
ste->ste_free = 1;
return PySet_Add(free, name) >= 0;
if (bound) {
contains = PySet_Contains(bound, name);
if (contains < 0) {
return 0;
}
if (contains) {
SET_SCOPE(scopes, name, FREE);
ste->ste_free = 1;
return PySet_Add(free, name) >= 0;
}
}
/* If a parent has a global statement, then call it global
explicit? It could also be global implicit.
*/
if (global && PySet_Contains(global, name)) {
SET_SCOPE(scopes, name, GLOBAL_IMPLICIT);
return 1;
if (global) {
contains = PySet_Contains(global, name);
if (contains < 0) {
return 0;
}
if (contains) {
SET_SCOPE(scopes, name, GLOBAL_IMPLICIT);
return 1;
}
}
if (ste->ste_nested)
ste->ste_free = 1;
Expand Down Expand Up @@ -712,8 +733,19 @@ analyze_cells(PyObject *scopes, PyObject *free, PyObject *inlined_cells)
scope = PyLong_AS_LONG(v);
if (scope != LOCAL)
continue;
if (!PySet_Contains(free, name) && !PySet_Contains(inlined_cells, name))
continue;
int contains = PySet_Contains(free, name);
if (contains < 0) {
goto error;
}
if (!contains) {
contains = PySet_Contains(inlined_cells, name);
if (contains < 0) {
goto error;
}
if (!contains) {
continue;
}
}
/* Replace LOCAL with CELL for this name, and remove
from free. It is safe to replace the value of name
in the dict, because it will not cause a resize.
Expand Down Expand Up @@ -764,7 +796,11 @@ update_symbols(PyObject *symbols, PyObject *scopes,
long scope, flags;
assert(PyLong_Check(v));
flags = PyLong_AS_LONG(v);
if (PySet_Contains(inlined_cells, name)) {
int contains = PySet_Contains(inlined_cells, name);
if (contains < 0) {
return 0;
}
if (contains) {
flags |= DEF_COMP_CELL;
}
v_scope = PyDict_GetItemWithError(scopes, name);
Expand Down Expand Up @@ -822,9 +858,15 @@ update_symbols(PyObject *symbols, PyObject *scopes,
goto error;
}
/* Handle global symbol */
if (bound && !PySet_Contains(bound, name)) {
Py_DECREF(name);
continue; /* it's a global */
if (bound) {
int contains = PySet_Contains(bound, name);
if (contains < 0) {
goto error;
}
if (!contains) {
Py_DECREF(name);
continue; /* it's a global */
}
}
/* Propagate new free symbol up the lexical stack */
if (PyDict_SetItem(symbols, name, v_free) < 0) {
Expand Down