complex_new(): This could leak when the argument was neither string nor

tim_one · tim_one · commit 1988e071248e · 2003-08-15T01:16:37.000Z
number. This accounts for the 2 refcount leaks per test_complex run Michael Hudson discovered (I figured only I would have the stomach to look for leaks in floating-point code <wink>). git-svn-id: http://svn.python.org/projects/python/trunk@33863 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.4 alpha 1?
 Core and builtins
 -----------------
 
+- complex(obj) could leak a little memory if obj wasn't a string or
+  number.
+
 - zip() with no arguments now returns an empty list instead of raising
   a TypeError exception.
 
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -882,6 +882,9 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 	    ((i != NULL) && (nbi == NULL || nbi->nb_float == NULL))) {
 		PyErr_SetString(PyExc_TypeError,
 			   "complex() argument must be a string or a number");
+		if (own_r) {
+			Py_DECREF(r);
+		}
 		return NULL;
 	}
 	if (PyComplex_Check(r)) {
