summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-01 21:16:10 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-01 21:16:10 (GMT)
commitf43f65b69f9190ed7300b8d0334d8f44b657b9fd (patch)
treee3d58d85a0736b9b29a352d49b137d6c586cf9b8 /Objects
parent38164c3b04b1388829ef7a062438c8511f69f8fb (diff)
downloadcpython-f43f65b69f9190ed7300b8d0334d8f44b657b9fd.zip
cpython-f43f65b69f9190ed7300b8d0334d8f44b657b9fd.tar.gz
cpython-f43f65b69f9190ed7300b8d0334d8f44b657b9fd.tar.bz2
Merged revisions 84408-84409 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84408 | antoine.pitrou | 2010-09-01 23:14:16 +0200 (mer., 01 sept. 2010) | 4 lines Issue #9737: Fix a crash when trying to delete a slice or an item from a memoryview object. ........ r84409 | antoine.pitrou | 2010-09-01 23:14:46 +0200 (mer., 01 sept. 2010) | 3 lines Fix a compilation warning ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/memoryobject.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index d09c268..f5dacb0 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -179,7 +179,7 @@ _indirect_copy_nd(char *dest, Py_buffer *view, char fort)
int k;
Py_ssize_t elements;
char *ptr;
- void (*func)(int, Py_ssize_t *, Py_ssize_t *);
+ void (*func)(int, Py_ssize_t *, const Py_ssize_t *);
if (view->ndim > PY_SSIZE_T_MAX / sizeof(Py_ssize_t)) {
PyErr_NoMemory();
@@ -631,6 +631,11 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value)
"cannot modify read-only memory");
return -1;
}
+ if (value == NULL) {
+ PyErr_SetString(PyExc_TypeError,
+ "cannot delete memory");
+ return -1;
+ }
if (view->ndim != 1) {
PyErr_SetNone(PyExc_NotImplementedError);
return -1;