diff options
| author | Georg Brandl <georg@python.org> | 2007-02-26 13:51:34 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2007-02-26 13:51:34 +0000 |
| commit | 5f795865da15f1001dd876cda3932f8daf2bc384 (patch) | |
| tree | 0306d3f8da701931c376382148ef90c89d33176a | |
| parent | 25e7cfa4b9aec196047de80bcd28bff8f3f0dd43 (diff) | |
| download | cpython-git-5f795865da15f1001dd876cda3932f8daf2bc384.tar.gz | |
Backport from Py3k branch: fix refleak in PyString_Format.
(backport from rev. 53935)
| -rw-r--r-- | Objects/stringobject.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index aa2fd872dd..5ae2ca06c0 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -4764,10 +4764,13 @@ PyString_Format(PyObject *format, PyObject *args) reslen += rescnt; if (reslen < 0) { Py_DECREF(result); + Py_XDECREF(temp); return PyErr_NoMemory(); } - if (_PyString_Resize(&result, reslen) < 0) + if (_PyString_Resize(&result, reslen) < 0) { + Py_XDECREF(temp); return NULL; + } res = PyString_AS_STRING(result) + reslen - rescnt; } @@ -4818,6 +4821,7 @@ PyString_Format(PyObject *format, PyObject *args) if (dict && (argidx < arglen) && c != '%') { PyErr_SetString(PyExc_TypeError, "not all arguments converted during string formatting"); + Py_XDECREF(temp); goto error; } Py_XDECREF(temp); |