mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
Merged revisions 68560 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68560 | amaury.forgeotdarc | 2009-01-13 00:36:55 +0100 (mar., 13 janv. 2009) | 6 lines #3720: Interpreter crashes when an evil iterator removes its own next function. Now the slot is filled with a function that always raises. Will not backport: extensions compiled with 2.6.x would not run on 2.6.0. ........
This commit is contained in:
parent
e5e298f875
commit
f343e01c17
10 changed files with 47 additions and 67 deletions
|
@ -2736,7 +2736,6 @@ PyObject *
|
|||
PyIter_Next(PyObject *iter)
|
||||
{
|
||||
PyObject *result;
|
||||
assert(PyIter_Check(iter));
|
||||
result = (*iter->ob_type->tp_iternext)(iter);
|
||||
if (result == NULL &&
|
||||
PyErr_Occurred() &&
|
||||
|
|
|
@ -1020,6 +1020,20 @@ PyObject_SelfIter(PyObject *obj)
|
|||
return obj;
|
||||
}
|
||||
|
||||
/* Helper used when the __next__ method is removed from a type:
|
||||
tp_iternext is never NULL and can be safely called without checking
|
||||
on every iteration.
|
||||
*/
|
||||
|
||||
PyObject *
|
||||
_PyObject_NextNotImplemented(PyObject *self)
|
||||
{
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"'%.200s' object is not iterable",
|
||||
Py_TYPE(self)->tp_name);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Generic GetAttr functions - put these in your tp_[gs]etattro slot */
|
||||
|
||||
PyObject *
|
||||
|
|
|
@ -5630,8 +5630,12 @@ update_one_slot(PyTypeObject *type, slotdef *p)
|
|||
}
|
||||
do {
|
||||
descr = _PyType_Lookup(type, p->name_strobj);
|
||||
if (descr == NULL)
|
||||
if (descr == NULL) {
|
||||
if (ptr == (void**)&type->tp_iternext) {
|
||||
specific = _PyObject_NextNotImplemented;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (Py_TYPE(descr) == &PyWrapperDescr_Type) {
|
||||
void **tptr = resolve_slotdups(type, p->name_strobj);
|
||||
if (tptr == NULL || tptr == ptr)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue