From 10a4b0e6df1e33e2f2f4be43dc1c4af8098f0fb0 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 26 Feb 2007 13:51:29 +0000
Subject: [PATCH] Backport from Py3k branch: fix refleak in PyString_Format.

---
 Objects/stringobject.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index ca94d72b311..64be0de1999 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4767,10 +4767,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;
 			}
@@ -4821,6 +4824,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);