Commit0c2b509

authored

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

Objects do not own weak references to them directly through the __weakref__ list so thesedo not need to be traversed by the GC.

1 parentb3b9ade commit0c2b509Copy full SHA for 0c2b509

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -753,6 +753,26 @@ def test_iterators_pickling(self):`
`753`	`753`	`self.assertEqual(list(unpickled),expected)`
`754`	`754`	`self.assertEqual(list(it),expected)`
`755`	`755`
	`756`	`+@support.cpython_only`
	`757`	`+deftest_weakref_list_is_not_traversed(self):`
	`758`	`+# Check that the weakref list is not traversed when collecting`
	`759`	`+# OrderedDict objects. See bpo-39778 for more information.`
	`760`	`+`
	`761`	`+gc.collect()`
	`762`	`+`
	`763`	`+x=self.OrderedDict()`
	`764`	`+x.cycle=x`
	`765`	`+`
	`766`	`+cycle= []`
	`767`	`+cycle.append(cycle)`
	`768`	`+`
	`769`	`+x_ref=weakref.ref(x)`
	`770`	`+cycle.append(x_ref)`
	`771`	`+`
	`772`	`+delx,cycle,x_ref`
	`773`	`+`
	`774`	`+gc.collect()`
	`775`	`+`
`756`	`776`
`757`	`777`	`classPurePythonOrderedDictSubclassTests(PurePythonOrderedDictTests):`
`758`	`778`

Lines changed: 2 additions & 0 deletions

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.

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1454,7 +1454,6 @@ odict_traverse(PyODictObject od, visitproc visit, void arg)`
`1454`	`1454`	`_ODictNode*node;`
`1455`	`1455`
`1456`	`1456`	`Py_VISIT(od->od_inst_dict);`
`1457`		`-Py_VISIT(od->od_weakreflist);`
`1458`	`1457`	`_odict_FOREACH(od,node) {`
`1459`	`1458`	`Py_VISIT(_odictnode_KEY(node));`
`1460`	`1459`	`}`
`@@ -1467,7 +1466,6 @@ static int`
`1467`	`1466`	`odict_tp_clear(PyODictObject*od)`
`1468`	`1467`	`{`
`1469`	`1468`	`Py_CLEAR(od->od_inst_dict);`
`1470`		`-Py_CLEAR(od->od_weakreflist);`
`1471`	`1469`	`PyDict_Clear((PyObject*)od);`
`1472`	`1470`	`_odict_clear_nodes(od);`
`1473`	`1471`	`return0;`

Comments

(0)