mirror of
https://github.com/python/cpython
synced 2024-10-14 09:43:55 +00:00
gh-111049: Fix crash during garbage collection of the BytesIO buffer object (GH-111221)
This commit is contained in:
parent
4d5d9acb22
commit
bb36f72efc
|
@ -6,10 +6,12 @@
|
|||
import unittest
|
||||
from test import support
|
||||
|
||||
import gc
|
||||
import io
|
||||
import _pyio as pyio
|
||||
import pickle
|
||||
import sys
|
||||
import weakref
|
||||
|
||||
class IntLike:
|
||||
def __init__(self, num):
|
||||
|
@ -477,6 +479,25 @@ def test_getbuffer_empty(self):
|
|||
buf2.release()
|
||||
memio.write(b'x')
|
||||
|
||||
def test_getbuffer_gc_collect(self):
|
||||
memio = self.ioclass(b"1234567890")
|
||||
buf = memio.getbuffer()
|
||||
memiowr = weakref.ref(memio)
|
||||
bufwr = weakref.ref(buf)
|
||||
# Create a reference loop.
|
||||
a = [buf]
|
||||
a.append(a)
|
||||
# The Python implementation emits an unraisable exception.
|
||||
with support.catch_unraisable_exception():
|
||||
del memio
|
||||
del buf
|
||||
del a
|
||||
# The C implementation emits an unraisable exception.
|
||||
with support.catch_unraisable_exception():
|
||||
gc.collect()
|
||||
self.assertIsNone(memiowr())
|
||||
self.assertIsNone(bufwr())
|
||||
|
||||
def test_read1(self):
|
||||
buf = self.buftype("1234567890")
|
||||
self.assertEqual(self.ioclass(buf).read1(), buf)
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix crash during garbage collection of the :class:`io.BytesIO` buffer
|
||||
object.
|
|
@ -990,7 +990,9 @@ static int
|
|||
bytesio_clear(bytesio *self)
|
||||
{
|
||||
Py_CLEAR(self->dict);
|
||||
Py_CLEAR(self->buf);
|
||||
if (self->exports == 0) {
|
||||
Py_CLEAR(self->buf);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1095,13 +1097,6 @@ bytesiobuf_releasebuffer(bytesiobuf *obj, Py_buffer *view)
|
|||
b->exports--;
|
||||
}
|
||||
|
||||
static int
|
||||
bytesiobuf_clear(bytesiobuf *self)
|
||||
{
|
||||
Py_CLEAR(self->source);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
bytesiobuf_traverse(bytesiobuf *self, visitproc visit, void *arg)
|
||||
{
|
||||
|
@ -1116,7 +1111,7 @@ bytesiobuf_dealloc(bytesiobuf *self)
|
|||
PyTypeObject *tp = Py_TYPE(self);
|
||||
/* bpo-31095: UnTrack is needed before calling any callbacks */
|
||||
PyObject_GC_UnTrack(self);
|
||||
(void)bytesiobuf_clear(self);
|
||||
Py_CLEAR(self->source);
|
||||
tp->tp_free(self);
|
||||
Py_DECREF(tp);
|
||||
}
|
||||
|
@ -1124,7 +1119,6 @@ bytesiobuf_dealloc(bytesiobuf *self)
|
|||
static PyType_Slot bytesiobuf_slots[] = {
|
||||
{Py_tp_dealloc, bytesiobuf_dealloc},
|
||||
{Py_tp_traverse, bytesiobuf_traverse},
|
||||
{Py_tp_clear, bytesiobuf_clear},
|
||||
|
||||
// Buffer protocol
|
||||
{Py_bf_getbuffer, bytesiobuf_getbuffer},
|
||||
|
|
Loading…
Reference in a new issue