From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Fri, 8 Mar 2002 21:11:37 +0000 (+0000)
Subject: Fix for SF bug 516727: MyInt(2) + "3" -> NotImplemented
X-Git-Tag: v2.3c1~6547
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ae6a43a77e3170cc952d182b67533b560eb6dbe;p=python

Fix for SF bug 516727: MyInt(2) + "3" -> NotImplemented

PyNumber_Add() tries the nb_add slot first, then falls back to
sq_concat.  However, tt didn't check the return value of sq_concat.
If sq_concat returns NotImplemented, raise the standard TypeError.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 2acfd0865c..2207602550 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -605,11 +605,10 @@ 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(Py_NotImplemented);
-		if (m && m->sq_concat) {
+		Py_DECREF(result);
+		if (m && m->sq_concat)
 			result = (*m->sq_concat)(v, w);
-		}
-                else {
+		if (result == Py_NotImplemented) {
                     PyErr_Format(
 			    PyExc_TypeError,
 			    "unsupported operand types for +: '%s' and '%s'",