Mercurial > cpython-lru_cache-weakref
changeset 47672:5ebcdeb0cb26 legacy-trunk
Fix some memory dealloc problems when exceptions occur.
It caused: "Fatal Python error: UNREF invalid object" in the DoubleTest.
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Fri, 13 Jun 2008 06:02:26 +0000 |
| parents | e30af3264a0f |
| children | 1464345a1968 |
| files | Modules/arraymodule.c |
| diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Modules/arraymodule.c Fri Jun 13 06:00:46 2008 +0000 +++ b/Modules/arraymodule.c Fri Jun 13 06:02:26 2008 +0000 @@ -432,6 +432,9 @@ if (op == NULL) { return NULL; } + op->ob_descr = descr; + op->allocated = size; + op->weakreflist = NULL; Py_SIZE(op) = size; if (size <= 0) { op->ob_item = NULL; @@ -439,13 +442,10 @@ else { op->ob_item = PyMem_NEW(char, nbytes); if (op->ob_item == NULL) { - PyObject_Del(op); + Py_DECREF(op); return PyErr_NoMemory(); } } - op->ob_descr = descr; - op->allocated = size; - op->weakreflist = NULL; return (PyObject *) op; } @@ -826,14 +826,13 @@ } if ((Py_SIZE(self) > PY_SSIZE_T_MAX - Py_SIZE(b)) || ((Py_SIZE(self) + Py_SIZE(b)) > PY_SSIZE_T_MAX / self->ob_descr->itemsize)) { - PyErr_NoMemory(); - return -1; + PyErr_NoMemory(); + return -1; } size = Py_SIZE(self) + Py_SIZE(b); PyMem_RESIZE(self->ob_item, char, size*self->ob_descr->itemsize); if (self->ob_item == NULL) { - PyObject_Del(self); - PyErr_NoMemory(); + PyErr_NoMemory(); return -1; } memcpy(self->ob_item + Py_SIZE(self)*self->ob_descr->itemsize,
