Backport from Py3k branch: fix refleak in PyString_Format.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index ca94d72..64be0de 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4767,10 +4767,13 @@
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;
}
@@ -4821,6 +4824,7 @@
if (dict && (argidx < arglen) && c != '%') {
PyErr_SetString(PyExc_TypeError,
"not all arguments converted during string formatting");
+ Py_XDECREF(temp);
goto error;
}
Py_XDECREF(temp);