Mercurial > cpython-lru_cache-weakref

diff Objects/memoryobject.c @ 58645:cd00a94186c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 77916 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77916 | antoine.pitrou | 2010-02-02 23:36:17 +0100 (mar., 02 févr. 2010) | 4 lines Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer` fails. Patch by Florent Xicluna. ........
author Antoine Pitrou <solipsis@pitrou.net>
date Tue, 02 Feb 2010 22:47:00 +0000
parents 7b495c8f2a24
children 189fa92d15dc
line wrap: on
line diff
--- a/Objects/memoryobject.c	Mon Feb 01 01:18:51 2010 +0000
+++ b/Objects/memoryobject.c	Tue Feb 02 22:47:00 2010 +0000
@@ -76,6 +76,7 @@
 PyMemoryView_FromObject(PyObject *base)
 {
     PyMemoryViewObject *mview;
+    Py_buffer view;
 
     if (!PyObject_CheckBuffer(base)) {
         PyErr_SetString(PyExc_TypeError,
@@ -84,20 +85,17 @@
         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;
 }