[3.8] bpo-39778: Don't traverse weak-reference lists OrderedDict's tp_traverse and tp_clear (GH-18749) (GH-18756)

pablogsal · web-flow · commit 9ddcb914f9c2 · 2020-03-02T23:55:20.000Z
Objects do not own weak references to them directly through the __weakref__ list so these do not need to be traversed by the GC. (cherry picked from commit 0c2b509)
diff --git a/Lib/test/test_ordered_dict.py b/Lib/test/test_ordered_dict.py
@@ -753,6 +753,26 @@ def test_iterators_pickling(self):
                     self.assertEqual(list(unpickled), expected)
                     self.assertEqual(list(it), expected)
 
+    @support.cpython_only
+    def test_weakref_list_is_not_traversed(self):
+        # Check that the weakref list is not traversed when collecting
+        # OrderedDict objects. See bpo-39778 for more information.
+
+        gc.collect()
+
+        x = self.OrderedDict()
+        x.cycle = x
+
+        cycle = []
+        cycle.append(cycle)
+
+        x_ref = weakref.ref(x)
+        cycle.append(x_ref)
+
+        del x, cycle, x_ref
+
+        gc.collect()
+
 
 class PurePythonOrderedDictSubclassTests(PurePythonOrderedDictTests):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-03-02-19-21-21.bpo-39778._YGLEc.rst b/Misc/NEWS.d/next/Core and Builtins/2020-03-02-19-21-21.bpo-39778._YGLEc.rst
@@ -0,0 +1,2 @@
+Fixed a crash due to incorrect handling of weak references in
+``collections.OrderedDict`` classes. Patch by Pablo Galindo.
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
@@ -1453,7 +1453,6 @@ odict_traverse(PyODictObject *od, visitproc visit, void *arg)
     _ODictNode *node;
 
     Py_VISIT(od->od_inst_dict);
-    Py_VISIT(od->od_weakreflist);
     _odict_FOREACH(od, node) {
         Py_VISIT(_odictnode_KEY(node));
     }
@@ -1466,7 +1465,6 @@ static int
 odict_tp_clear(PyODictObject *od)
 {
     Py_CLEAR(od->od_inst_dict);
-    Py_CLEAR(od->od_weakreflist);
     PyDict_Clear((PyObject *)od);
     _odict_clear_nodes(od);
     return 0;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed a crash due to incorrect handling of weak references in`
	`2`	+``collections.OrderedDict`` classes. Patch by Pablo Galindo.
Original file line number	Diff line number	Diff line change
`@@ -1453,7 +1453,6 @@ odict_traverse(PyODictObject od, visitproc visit, void arg)`
`1453`	`1453`	`_ODictNode *node;`
`1454`	`1454`
`1455`	`1455`	`Py_VISIT(od->od_inst_dict);`
`1456`		`- Py_VISIT(od->od_weakreflist);`
`1457`	`1456`	`_odict_FOREACH(od, node) {`
`1458`	`1457`	`Py_VISIT(_odictnode_KEY(node));`
`1459`	`1458`	`}`
`@@ -1466,7 +1465,6 @@ static int`
`1466`	`1465`	`odict_tp_clear(PyODictObject *od)`
`1467`	`1466`	`{`
`1468`	`1467`	`Py_CLEAR(od->od_inst_dict);`
`1469`		`- Py_CLEAR(od->od_weakreflist);`
`1470`	`1468`	`PyDict_Clear((PyObject *)od);`
`1471`	`1469`	`_odict_clear_nodes(od);`
`1472`	`1470`	`return 0;`