Mercurial > cpython-lru_cache-weakref
diff Modules/arraymodule.c @ 48090:2da42dcbb8ce 2.5
Backport code from r65182:
Issue #2620: Overflow checking when allocating or reallocating memory
was not always being done properly in some python types and extension
modules. PyMem_MALLOC, PyMem_REALLOC, PyMem_NEW and PyMem_RESIZE have
all been updated to perform better checks and places in the code that
would previously leak memory on the error path when such an allocation
failed have been fixed.
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Mon, 28 Jul 2008 05:06:20 +0000 |
| parents | 4504dfcc1924 |
| children | 787b969d37f0 |
line wrap: on
line diff
--- a/Modules/arraymodule.c Fri Jul 25 19:00:48 2008 +0000 +++ b/Modules/arraymodule.c Mon Jul 28 05:06:20 2008 +0000 @@ -816,6 +816,7 @@ array_do_extend(arrayobject *self, PyObject *bb) { Py_ssize_t size; + char *old_item; if (!array_Check(bb)) return array_iter_extend(self, bb); @@ -831,10 +832,11 @@ return -1; } size = self->ob_size + b->ob_size; + old_item = self->ob_item; PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize); if (self->ob_item == NULL) { - PyObject_Del(self); - PyErr_NoMemory(); + self->ob_item = old_item; + PyErr_NoMemory(); return -1; } memcpy(self->ob_item + self->ob_size*self->ob_descr->itemsize, @@ -886,7 +888,7 @@ if (size > PY_SSIZE_T_MAX / n) { return PyErr_NoMemory(); } - PyMem_Resize(items, char, n * size); + PyMem_RESIZE(items, char, n * size); if (items == NULL) return PyErr_NoMemory(); p = items;