mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix a crash: when sq_item failed the code continued blindly and used the

Browse source 
NULL pointer. (Detected by Michael Hudson, patch provided by Neal Norwitz).

Fix refcounting leak in filtertuple().
This commit is contained in:
Walter Dörwald 2003-08-18 18:28:45 +00:00
parent 6019f9a65d
commit c58a3a10a9
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Python/bltinmodule.c
View file

@ -2174,6 +2174,8 @@ filtertuple(PyObject *func, PyObject *tuple)
if (tuple->ob_type->tp_as_sequence && if (tuple->ob_type->tp_as_sequence &&
tuple->ob_type->tp_as_sequence->sq_item) { tuple->ob_type->tp_as_sequence->sq_item) {
item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i); item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i);
if (item == NULL)
goto Fail_1;
} else { } else {
PyErr_SetString(PyExc_TypeError, "filter(): unsubscriptable tuple"); PyErr_SetString(PyExc_TypeError, "filter(): unsubscriptable tuple");
goto Fail_1; goto Fail_1;
@ -2184,20 +2186,25 @@ filtertuple(PyObject *func, PyObject *tuple)
} }
else { else {
PyObject *arg = Py_BuildValue("(O)", item); PyObject *arg = Py_BuildValue("(O)", item);
if (arg == NULL) if (arg == NULL) {
Py_DECREF(item);
goto Fail_1; goto Fail_1;
}
good = PyEval_CallObject(func, arg); good = PyEval_CallObject(func, arg);
Py_DECREF(arg); Py_DECREF(arg);
if (good == NULL) if (good == NULL) {
Py_DECREF(item);
goto Fail_1; goto Fail_1;
}
} }
ok = PyObject_IsTrue(good); ok = PyObject_IsTrue(good);
Py_DECREF(good); Py_DECREF(good);
if (ok) { if (ok) {
Py_INCREF(item);
if (PyTuple_SetItem(result, j++, item) < 0) if (PyTuple_SetItem(result, j++, item) < 0)
goto Fail_1; goto Fail_1;
} }
else
Py_DECREF(item);
} }
if (_PyTuple_Resize(&result, j) < 0) if (_PyTuple_Resize(&result, j) < 0)