mirror of
https://github.com/python/cpython.git
synced 2025-11-01 10:45:30 +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() &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue