Commit 8237a33e authored by Benjamin Peterson's avatar Benjamin Peterson

clear BufferedRWPair weakrefs on deallocation (closes #22517)

parent e5a919dc
...@@ -1524,6 +1524,12 @@ class BufferedRWPairTest(unittest.TestCase): ...@@ -1524,6 +1524,12 @@ class BufferedRWPairTest(unittest.TestCase):
pair = self.tp(SelectableIsAtty(True), SelectableIsAtty(True)) pair = self.tp(SelectableIsAtty(True), SelectableIsAtty(True))
self.assertTrue(pair.isatty()) 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): class CBufferedRWPairTest(BufferedRWPairTest):
tp = io.BufferedRWPair tp = io.BufferedRWPair
......
...@@ -17,6 +17,9 @@ Core and Builtins ...@@ -17,6 +17,9 @@ Core and Builtins
Library Library
------- -------
- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its
weakrefs.
- Issue #22419: Limit the length of incoming HTTP request in wsgiref server to - Issue #22419: Limit the length of incoming HTTP request in wsgiref server to
65536 bytes and send a 414 error code for higher lengths. Patch contributed 65536 bytes and send a 414 error code for higher lengths. Patch contributed
by Devin Cook. by Devin Cook.
......
...@@ -2254,6 +2254,8 @@ static void ...@@ -2254,6 +2254,8 @@ static void
bufferedrwpair_dealloc(rwpair *self) bufferedrwpair_dealloc(rwpair *self)
{ {
_PyObject_GC_UNTRACK(self); _PyObject_GC_UNTRACK(self);
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *)self);
Py_CLEAR(self->reader); Py_CLEAR(self->reader);
Py_CLEAR(self->writer); Py_CLEAR(self->writer);
Py_CLEAR(self->dict); Py_CLEAR(self->dict);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment