diff options
| author | Daniel Stutzbach <daniel@stutzbachenterprises.com> | 2011-03-02 23:37:50 (GMT) |
|---|---|---|
| committer | Daniel Stutzbach <daniel@stutzbachenterprises.com> | 2011-03-02 23:37:50 (GMT) |
| commit | 8eda5f7cd9007b6e60be6458f981b504c1442071 (patch) | |
| tree | 4c400be3c3d9663d7c9f42046f2d8cce5406b07d | |
| parent | 2f283c2c19f821dd5a0f2ad4a4da4c90fe583bb9 (diff) | |
| download | cpython-8eda5f7cd9007b6e60be6458f981b504c1442071.zip cpython-8eda5f7cd9007b6e60be6458f981b504c1442071.tar.gz cpython-8eda5f7cd9007b6e60be6458f981b504c1442071.tar.bz2 | |
#11335: Fix memory leak when a sort key function throws an exception
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/listobject.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1? Core and Builtins ----------------- +- Issue #11335: Fixed a memory leak in list.sort when the key function + throws an exception. + - Issue #8923: When a string is encoded to UTF-8 in strict mode, the result is cached into the object. Examples: str.encode(), str.encode('utf-8'), PyUnicode_AsUTF8String() and PyUnicode_AsEncodedString(unicode, "utf-8", diff --git a/Objects/listobject.c b/Objects/listobject.c index 9b2d36f..114749e 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1957,6 +1957,8 @@ listsort(PyListObject *self, PyObject *args, PyObject *kwds) if (keys[i] == NULL) { for (i=i-1 ; i>=0 ; i--) Py_DECREF(keys[i]); + if (keys != &ms.temparray[saved_ob_size+1]) + PyMem_FREE(keys); goto keyfunc_fail; } } |