diff options
| author |   Serhiy Storchaka <storchaka@gmail.com> | 2015-03-30 09:52:29 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-03-30 09:52:29 +0300 |
| commit | 4aa867959f19ce92ccf999aa9f9dc4bd0b49ead7 (patch) | |
| tree | ad0e6b276c1d833231497ba3941c1ecc62b8f099 /Objects/weakrefobject.c | |
| parent | #23745: handle duplicate MIME parameter names in new parser. (diff) | |
| download | cpython-4aa867959f19ce92ccf999aa9f9dc4bd0b49ead7.tar.gz cpython-4aa867959f19ce92ccf999aa9f9dc4bd0b49ead7.tar.bz2 cpython-4aa867959f19ce92ccf999aa9f9dc4bd0b49ead7.zip | |
Issue #23783: Fixed memory leak in PyObject_ClearWeakRefs() in case of
MemoryError.
Diffstat (limited to 'Objects/weakrefobject.c')
| -rw-r--r-- | Objects/weakrefobject.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index c083f8fce5e..d4d52e60aea 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -900,11 +900,9 @@ PyObject_ClearWeakRefs(PyObject *object) if (*list != NULL) { PyWeakReference *current = *list; Py_ssize_t count = _PyWeakref_GetWeakrefCount(current); - int restore_error = PyErr_Occurred() ? 1 : 0; PyObject *err_type, *err_value, *err_tb; - if (restore_error) - PyErr_Fetch(&err_type, &err_value, &err_tb); + PyErr_Fetch(&err_type, &err_value, &err_tb); if (count == 1) { PyObject *callback = current->wr_callback; @@ -922,8 +920,7 @@ PyObject_ClearWeakRefs(PyObject *object) tuple = PyTuple_New(count * 2); if (tuple == NULL) { - if (restore_error) - PyErr_Fetch(&err_type, &err_value, &err_tb); + _PyErr_ChainExceptions(err_type, err_value, err_tb); return; } @@ -954,7 +951,7 @@ PyObject_ClearWeakRefs(PyObject *object) } Py_DECREF(tuple); } - if (restore_error) - PyErr_Restore(err_type, err_value, err_tb); + assert(!PyErr_Occurred()); + PyErr_Restore(err_type, err_value, err_tb); } } |