mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.13] gh-126980: Fix bytearray.__buffer__ crash on PyBUF_{READ,WRITE} (GH-126981) (#127023)

Browse source 
(cherry picked from commit 3932e1db53)

Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
sobolevn 2024-11-19 20:37:53 +03:00 • committed by GitHub
parent dd222a4d47
commit 3fae84fe58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_buffer.py
View file

@ -4439,6 +4439,14 @@ class TestBufferProtocol(unittest.TestCase):
x = ndarray([1,2,3], shape=[3], flags=ND_GETBUF_FAIL) x = ndarray([1,2,3], shape=[3], flags=ND_GETBUF_FAIL)
self.assertRaises(BufferError, memoryview, x) self.assertRaises(BufferError, memoryview, x)
def test_bytearray_release_buffer_read_flag(self):
# See https://github.com/python/cpython/issues/126980
obj = bytearray(b'abc')
with self.assertRaises(SystemError):
obj.__buffer__(inspect.BufferFlags.READ)
with self.assertRaises(SystemError):
obj.__buffer__(inspect.BufferFlags.WRITE)
@support.cpython_only @support.cpython_only
def test_pybuffer_size_from_format(self): def test_pybuffer_size_from_format(self):
# basic tests # basic tests

3
Misc/NEWS.d/next/Core_and_Builtins/2024-11-18-23-18-17.gh-issue-126980.r8QHdi.rst Normal file
View file

@ -0,0 +1,3 @@
Fix :meth:`~object.__buffer__` of :class:`bytearray` crashing when
:attr:`~inspect.BufferFlags.READ` or :attr:`~inspect.BufferFlags.WRITE` are
passed as flags.

8
Objects/bytearrayobject.c
View file

@ -44,15 +44,15 @@ _getbytevalue(PyObject* arg, int *value)
static int static int
bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags) bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags)
{ {
void *ptr;
if (view == NULL) { if (view == NULL) {
PyErr_SetString(PyExc_BufferError, PyErr_SetString(PyExc_BufferError,
"bytearray_getbuffer: view==NULL argument is obsolete"); "bytearray_getbuffer: view==NULL argument is obsolete");
return -1; return -1;
} }
ptr = (void *) PyByteArray_AS_STRING(obj); void *ptr = (void *) PyByteArray_AS_STRING(obj);
/* cannot fail if view != NULL and readonly == 0 */ if (PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags) < 0) {
(void)PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags); return -1;
}
obj->ob_exports++; obj->ob_exports++;
return 0; return 0;
} }