Issue #14203: Remove obsolete support for view==NULL in PyBuffer_FillInfo()
and bytearray_getbuffer(). Both functions now raise BufferError in that
case.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index ce22f4b..8b3267e 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -60,18 +60,17 @@
static int
bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags)
{
- int ret;
void *ptr;
if (view == NULL) {
- obj->ob_exports++;
- return 0;
+ PyErr_SetString(PyExc_BufferError,
+ "bytearray_getbuffer: view==NULL argument is obsolete");
+ return -1;
}
ptr = (void *) PyByteArray_AS_STRING(obj);
- ret = PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags);
- if (ret >= 0) {
- obj->ob_exports++;
- }
- return ret;
+ /* cannot fail if view != NULL and readonly == 0 */
+ (void)PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags);
+ obj->ob_exports++;
+ return 0;
}
static void