Issue #22517: When a io.BufferedRWPair object is deallocated, clear its

birkenfeld · birkenfeld · commit 21bf3f942be9 · 2014-09-30T14:54:39.000+02:00
weakrefs.
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
@@ -1454,6 +1454,12 @@ def isatty(self):
         pair = self.tp(SelectableIsAtty(True), SelectableIsAtty(True))
         self.assertTrue(pair.isatty())
 
+    def test_weakref_clearing(self):
+        brw = self.tp(self.MockRawIO(), self.MockRawIO())
+        ref = weakref.ref(brw)
+        brw = None
+        ref = None # Shouldn't segfault.
+
 class CBufferedRWPairTest(BufferedRWPairTest):
     tp = io.BufferedRWPair
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.6?
 Library
 -------
 
+- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its
+  weakrefs.
+
 - Issue #16041: CVE-2013-1752: poplib: Limit maximum line lengths to 2048 to
   prevent readline() calls from consuming too much memory.  Patch by Jyrki
   Pulliainen.
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -2141,6 +2141,8 @@ static void
 bufferedrwpair_dealloc(rwpair *self)
 {
     _PyObject_GC_UNTRACK(self);
+    if (self->weakreflist != NULL)
+        PyObject_ClearWeakRefs((PyObject *)self);
     Py_CLEAR(self->reader);
     Py_CLEAR(self->writer);
     Py_CLEAR(self->dict);

Original file line number	Diff line number	Diff line change
`@@ -2141,6 +2141,8 @@ static void`
`2141`	`2141`	`bufferedrwpair_dealloc(rwpair *self)`
`2142`	`2142`	`{`
`2143`	`2143`	`_PyObject_GC_UNTRACK(self);`
	`2144`	`+ if (self->weakreflist != NULL)`
	`2145`	`+ PyObject_ClearWeakRefs((PyObject *)self);`
`2144`	`2146`	`Py_CLEAR(self->reader);`
`2145`	`2147`	`Py_CLEAR(self->writer);`
`2146`	`2148`	`Py_CLEAR(self->dict);`