diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-02-24 20:53:48 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-02-24 20:53:48 +0000 |
| commit | df3c6cd2ff7f7ce78c54e26bdafb5922901e0be0 (patch) | |
| tree | 506f8d0c13bc4c6ccf3ef09ac5b3aa0a4e8d23eb /Objects/memoryobject.c | |
| parent | 556bdc3e030c7207036204df980c978a1ab29d85 (diff) | |
| download | cpython-df3c6cd2ff7f7ce78c54e26bdafb5922901e0be0.tar.gz | |
Merged revisions 88550 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
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.
........
Diffstat (limited to 'Objects/memoryobject.c')
| -rw-r--r-- | Objects/memoryobject.c | 5 |
1 files changed, 5 insertions, 0 deletions
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) |