From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Fri, 8 Mar 2002 21:28:54 +0000 (+0000)
Subject: Fix leak of NotImplemented in previous checkin to PyNumber_Add().
X-Git-Tag: v2.3c1~6546
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0522d9891aec9b7d49049a8a47b687c81929e02d;p=python

Fix leak of NotImplemented in previous checkin to PyNumber_Add().

If result == Py_NotImplemented, always DECREF it before assigning a
new value to result.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 2207602550..162c53c9b3 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -605,16 +605,18 @@ PyNumber_Add(PyObject *v, PyObject *w)
 	PyObject *result = binary_op1(v, w, NB_SLOT(nb_add));
 	if (result == Py_NotImplemented) {
 		PySequenceMethods *m = v->ob_type->tp_as_sequence;
-		Py_DECREF(result);
-		if (m && m->sq_concat)
+		if (m && m->sq_concat) {
+			Py_DECREF(result);
 			result = (*m->sq_concat)(v, w);
+		}
 		if (result == Py_NotImplemented) {
-                    PyErr_Format(
+			Py_DECREF(result);
+			PyErr_Format(
 			    PyExc_TypeError,
 			    "unsupported operand types for +: '%s' and '%s'",
 			    v->ob_type->tp_name,
 			    w->ob_type->tp_name);
-                    result = NULL;
+			result = NULL;
                 }
 	}
 	return result;