Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

If result == Py_NotImplemented, always DECREF it before assigning a
new value to result.
This commit is contained in:
Jeremy Hylton 2002-03-08 21:28:54 +00:00
parent 6ae6a43a77
commit 0522d9891a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Objects/abstract.c
View File

@ -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;