diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-02-02 22:36:17 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-02-02 22:36:17 (GMT) |
commit | 526e421b12654368443926b83fb0ca1e7ff027b4 (patch) | |
tree | c37bf012a0a5e1b5679983dc45dbc2b3994b39dc /Objects | |
parent | 1b93fc1077d0b99518035ffc7f63e568b8389e35 (diff) | |
download | cpython-526e421b12654368443926b83fb0ca1e7ff027b4.zip cpython-526e421b12654368443926b83fb0ca1e7ff027b4.tar.gz cpython-526e421b12654368443926b83fb0ca1e7ff027b4.tar.bz2 |
Issue #7385: Fix a crash in `MemoryView_FromObject` when
`PyObject_GetBuffer` fails. Patch by Florent Xicluna.
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/memoryobject.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 21e0645..524521a 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -76,6 +76,7 @@ PyObject * PyMemoryView_FromObject(PyObject *base) { PyMemoryViewObject *mview; + Py_buffer view; if (!PyObject_CheckBuffer(base)) { PyErr_SetString(PyExc_TypeError, @@ -84,20 +85,17 @@ PyMemoryView_FromObject(PyObject *base) return NULL; } - mview = (PyMemoryViewObject *) - PyObject_GC_New(PyMemoryViewObject, &PyMemoryView_Type); - if (mview == NULL) + if (PyObject_GetBuffer(base, &view, PyBUF_FULL_RO) < 0) return NULL; - mview->base = NULL; - if (PyObject_GetBuffer(base, &(mview->view), PyBUF_FULL_RO) < 0) { - Py_DECREF(mview); + mview = (PyMemoryViewObject *)PyMemoryView_FromBuffer(&view); + if (mview == NULL) { + PyBuffer_Release(&view); return NULL; } mview->base = base; Py_INCREF(base); - _PyObject_GC_TRACK(mview); return (PyObject *)mview; } |