Skip to content

gh-121863: Immortalize names in code objects to avoid crash #121903

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.

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
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions Lib/test/test_scope.py
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,30 @@ def dig(self):
gc_collect() # For PyPy or other GCs.
self.assertIsNone(ref())

def test_multiple_nesting(self):
# Regression test for https://github.com/python/cpython/issues/121863
class MultiplyNested:
def f1(self):
__arg = 1
class D:
def g(self, __arg):
return __arg
return D().g(_MultiplyNested__arg=2)

def f2(self):
__arg = 1
class D:
def g(self, __arg):
return __arg
return D().g

inst = MultiplyNested()
with self.assertRaises(TypeError):
inst.f1()

closure = inst.f2()
with self.assertRaises(TypeError):
closure(_MultiplyNested__arg=2)

if __name__ == '__main__':
unittest.main()
2 changes: 1 addition & 1 deletion Objects/codeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ intern_strings(PyObject *tuple)
"non-string found in code slot");
return -1;
}
_PyUnicode_InternMortal(interp, &_PyTuple_ITEMS(tuple)[i]);
_PyUnicode_InternImmortal(interp, &_PyTuple_ITEMS(tuple)[i]);
}
return 0;
}
Expand Down
Loading