summaryrefslogtreecommitdiff
path: root/Objects/memoryobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'Objects/memoryobject.c')
-rw-r--r--Objects/memoryobject.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index ad16bb2a38..4997fcc6c9 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();
@@ -639,6 +639,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;