traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[2.7] bpo-30347: Stop crashes when concurrently iterate over itertools.groupby() iterators. (GH-1557). (#3772) 

(cherry picked from commit c740e4fe8a)
This commit is contained in:
Serhiy Storchaka 2017-09-26 23:15:36 +03:00 committed by GitHub
parent 19eb87d857
commit d0b9dc3367
3 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Lib/test/test_itertools.py
View File

@ -1473,6 +1473,29 @@ class RegressionTests(unittest.TestCase):
with self.assertRaises(StopIteration):
next(it)
def test_issue30347_1(self):
def f(n):
if n == 5:
list(b)
return n != 6
for (k, b) in groupby(range(10), f):
list(b) # shouldn't crash
def test_issue30347_2(self):
class K(object):
i = 0
def __init__(self, v):
pass
def __eq__(self, other):
K.i += 1
if K.i == 1:
next(g, None)
return True
g = next(groupby(range(10), K))[1]
for j in range(2):
next(g, None) # shouldn't crash
class SubclassWithKwargsTest(unittest.TestCase):
def test_keywords_in_subclass(self):
# count is not subclassable...

1
Misc/NEWS.d/next/Library/2017-09-25-14-04-30.bpo-30347.B4--_D.rst Normal file
View File

@ -0,0 +1 @@
Stop crashes when concurrently iterate over itertools.groupby() iterators.

78
Modules/itertoolsmodule.c
View File

@ -71,10 +71,37 @@ groupby_traverse(groupbyobject *gbo, visitproc visit, void *arg)
return 0;
}
Py_LOCAL_INLINE(int)
groupby_step(groupbyobject *gbo)
{
PyObject *newvalue, *newkey, *oldvalue;
newvalue = PyIter_Next(gbo->it);
if (newvalue == NULL)
return -1;
if (gbo->keyfunc == Py_None) {
newkey = newvalue;
Py_INCREF(newvalue);
} else {
newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, newvalue, NULL);
if (newkey == NULL) {
Py_DECREF(newvalue);
return -1;
}
}
oldvalue = gbo->currvalue;
gbo->currvalue = newvalue;
Py_XSETREF(gbo->currkey, newkey);
Py_XDECREF(oldvalue);
return 0;
}
static PyObject *
groupby_next(groupbyobject *gbo)
{
PyObject *newvalue, *newkey, *r, *grouper, *tmp;
PyObject *r, *grouper;
/* skip to next iteration group */
for (;;) {
@ -93,35 +120,11 @@ groupby_next(groupbyobject *gbo)
break;
}
newvalue = PyIter_Next(gbo->it);
if (newvalue == NULL)
if (groupby_step(gbo) < 0)
return NULL;
if (gbo->keyfunc == Py_None) {
newkey = newvalue;
Py_INCREF(newvalue);
} else {
newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc,
newvalue, NULL);
if (newkey == NULL) {
Py_DECREF(newvalue);
return NULL;
}
}
tmp = gbo->currkey;
gbo->currkey = newkey;
Py_XDECREF(tmp);
tmp = gbo->currvalue;
gbo->currvalue = newvalue;
Py_XDECREF(tmp);
}
Py_INCREF(gbo->currkey);
tmp = gbo->tgtkey;
gbo->tgtkey = gbo->currkey;
Py_XDECREF(tmp);
Py_XSETREF(gbo->tgtkey, gbo->currkey);
grouper = _grouper_create(gbo, gbo->tgtkey);
if (grouper == NULL)
@ -229,29 +232,12 @@ static PyObject *
_grouper_next(_grouperobject *igo)
{
groupbyobject *gbo = (groupbyobject *)igo->parent;
PyObject *newvalue, *newkey, *r;
PyObject *r;
int rcmp;
if (gbo->currvalue == NULL) {
newvalue = PyIter_Next(gbo->it);
if (newvalue == NULL)
if (groupby_step(gbo) < 0)
return NULL;
if (gbo->keyfunc == Py_None) {
newkey = newvalue;
Py_INCREF(newvalue);
} else {
newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc,
newvalue, NULL);
if (newkey == NULL) {
Py_DECREF(newvalue);
return NULL;
}
}
assert(gbo->currkey == NULL);
gbo->currkey = newkey;
gbo->currvalue = newvalue;
}
assert(gbo->currkey != NULL);