mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
Objects/abstract.c
View file

@ -605,10 +605,12 @@ PyNumber_Add(PyObject *v, PyObject *w)
PyObject *result = binary_op1(v, w, NB_SLOT(nb_add)); PyObject *result = binary_op1(v, w, NB_SLOT(nb_add));
if (result == Py_NotImplemented) { if (result == Py_NotImplemented) {
PySequenceMethods *m = v->ob_type->tp_as_sequence; PySequenceMethods *m = v->ob_type->tp_as_sequence;
if (m && m->sq_concat) {
Py_DECREF(result); Py_DECREF(result);
if (m && m->sq_concat)
result = (*m->sq_concat)(v, w); result = (*m->sq_concat)(v, w);
}
if (result == Py_NotImplemented) { if (result == Py_NotImplemented) {
Py_DECREF(result);
PyErr_Format( PyErr_Format(
PyExc_TypeError, PyExc_TypeError,
"unsupported operand types for +: '%s' and '%s'", "unsupported operand types for +: '%s' and '%s'",