From 541067a64077998b486be183fdaffec42fe3fae8 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 14 Nov 2013 01:27:12 +0100 Subject: Issue #19437: Fix array.buffer_info(), handle PyLong_FromVoidPtr() and PyLong_FromLong() failure --- Modules/arraymodule.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index 75b31f5..3466064 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -1133,13 +1133,25 @@ Insert a new item x into the array before position i."); static PyObject * array_buffer_info(arrayobject *self, PyObject *unused) { - PyObject* retval = NULL; + PyObject *retval = NULL, *v; + retval = PyTuple_New(2); if (!retval) return NULL; - PyTuple_SET_ITEM(retval, 0, PyLong_FromVoidPtr(self->ob_item)); - PyTuple_SET_ITEM(retval, 1, PyLong_FromLong((long)(Py_SIZE(self)))); + v = PyLong_FromVoidPtr(self->ob_item); + if (v == NULL) { + Py_DECREF(retval); + return NULL; + } + PyTuple_SET_ITEM(retval, 0, v); + + v = PyLong_FromLong((long)(Py_SIZE(self))); + if (v == NULL) { + Py_DECREF(retval); + return NULL; + } + PyTuple_SET_ITEM(retval, 1, v); return retval; } -- cgit v0.12