mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 12:48:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix SF #441664: Python crash on del of a slice of a mmap

Browse source 
Check for slice/item deletion, which calls slice/item assignment with a NULL
value, and raise a TypeError instead of coredumping. Bugreport and suggested
fix by Alex Martelli.
This commit is contained in:
Thomas Wouters 2001-07-16 15:47:36 +00:00
parent 687a17deaa
commit 1baac7201e
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/mmapmodule.c
View file

@ -663,6 +663,11 @@ mmap_ass_slice(mmap_object *self, int ilow, int ihigh, PyObject *v)
else if ((size_t)ihigh > self->size) else if ((size_t)ihigh > self->size)
ihigh = self->size; ihigh = self->size;
if (v == NULL) {
PyErr_SetString(PyExc_TypeError,
"mmap object doesn't support slice deletion");
return -1;
}
if (! (PyString_Check(v)) ) { if (! (PyString_Check(v)) ) {
PyErr_SetString(PyExc_IndexError, PyErr_SetString(PyExc_IndexError,
"mmap slice assignment must be a string"); "mmap slice assignment must be a string");
@ -688,6 +693,11 @@ mmap_ass_item(mmap_object *self, int i, PyObject *v)
PyErr_SetString(PyExc_IndexError, "mmap index out of range"); PyErr_SetString(PyExc_IndexError, "mmap index out of range");
return -1; return -1;
} }
if (v == NULL) {
PyErr_SetString(PyExc_TypeError,
"mmap object doesn't support item deletion");
return -1;
}
if (! (PyString_Check(v) && PyString_Size(v)==1) ) { if (! (PyString_Check(v) && PyString_Size(v)==1) ) {
PyErr_SetString(PyExc_IndexError, PyErr_SetString(PyExc_IndexError,
"mmap assignment must be single-character string"); "mmap assignment must be single-character string");