gh-121863: Immortalize names in code objects to avoid crash (GH-121903)

encukou · web-flow · commit cffad5c6ef93 · 2024-07-17T11:31:28.000+02:00
diff --git a/Lib/test/test_scope.py b/Lib/test/test_scope.py
@@ -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()
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ intern_strings(PyObject *tuple)`
`147`	`147`	`"non-string found in code slot");`
`148`	`148`	`return -1;`
`149`	`149`	`}`
`150`		`- _PyUnicode_InternMortal(interp, &_PyTuple_ITEMS(tuple)[i]);`
	`150`	`+ _PyUnicode_InternImmortal(interp, &_PyTuple_ITEMS(tuple)[i]);`
`151`	`151`	`}`
`152`	`152`	`return 0;`
`153`	`153`	`}`