Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Backport from Py3k branch: fix refleak in PyString_Format. 

(backport from rev. 53935)
This commit is contained in:
Georg Brandl 2007-02-26 13:51:34 +00:00
parent 25e7cfa4b9
commit 5f795865da
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/stringobject.c
View File

@ -4764,10 +4764,13 @@ PyString_Format(PyObject *format, PyObject *args)
reslen += rescnt; reslen += rescnt;
if (reslen < 0) { if (reslen < 0) {
Py_DECREF(result); Py_DECREF(result);
Py_XDECREF(temp);
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
if (_PyString_Resize(&result, reslen) < 0) if (_PyString_Resize(&result, reslen) < 0) {
Py_XDECREF(temp);
return NULL; return NULL;
}
res = PyString_AS_STRING(result) res = PyString_AS_STRING(result)
+ reslen - rescnt; + reslen - rescnt;
} }
@ -4818,6 +4821,7 @@ PyString_Format(PyObject *format, PyObject *args)
if (dict && (argidx < arglen) && c != '%') { if (dict && (argidx < arglen) && c != '%') {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"not all arguments converted during string formatting"); "not all arguments converted during string formatting");
Py_XDECREF(temp);
goto error; goto error;
} }
Py_XDECREF(temp); Py_XDECREF(temp);