From 915605c59a82ca0f0015c4deec40b3e211ccb0c1 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 24 Feb 2011 20:53:48 +0000 Subject: Merged revisions 88550 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r88550 | antoine.pitrou | 2011-02-24 21:50:49 +0100 (jeu., 24 févr. 2011) | 4 lines Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with a buffer struct having a NULL data pointer. ........ --- Objects/memoryobject.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Objects/memoryobject.c') diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 7782076a5b..2e32b2a0e9 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -75,6 +75,11 @@ PyMemoryView_FromBuffer(Py_buffer *info) { PyMemoryViewObject *mview; + if (info->buf == NULL) { + PyErr_SetString(PyExc_ValueError, + "cannot make memory view from a buffer with a NULL data pointer"); + return NULL; + } mview = (PyMemoryViewObject *) PyObject_GC_New(PyMemoryViewObject, &PyMemoryView_Type); if (mview == NULL) -- cgit v1.2.1