diff options
| author | Georg Brandl <georg@python.org> | 2007-02-26 13:48:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2007-02-26 13:48:28 (GMT) |
| commit | 6ce7d1ed55b579c03334d8ef7a69102484d02ff1 (patch) | |
| tree | f7986413c3f30933327425d0aec6cff5ff56f014 /Objects | |
| parent | 80b331cb3080c9d9b28960f5e55475e3941ccdf6 (diff) | |
| download | cpython-6ce7d1ed55b579c03334d8ef7a69102484d02ff1.zip cpython-6ce7d1ed55b579c03334d8ef7a69102484d02ff1.tar.gz cpython-6ce7d1ed55b579c03334d8ef7a69102484d02ff1.tar.bz2 | |
Fix a refleak in PyString_Format.
Diffstat (limited to 'Objects')
| -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 d772e74..7212df9 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -4780,10 +4780,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; } @@ -4834,6 +4837,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); |