when an argument is a cell, set the local copy to NULL (see #17927)

This commit is contained in:
Benjamin Peterson 2013-05-12 18:16:06 -05:00
parent 3bfc5f5d83
commit 159ae41da6
3 changed files with 28 additions and 11 deletions

View file

@ -6510,9 +6510,17 @@ super_init(PyObject *self, PyObject *args, PyObject *kwds)
return -1;
}
obj = f->f_localsplus[0];
if (obj != NULL && PyCell_Check(obj)) {
/* It might be a cell. See cell var initialization in ceval.c. */
obj = PyCell_GET(obj);
if (obj == NULL && co->co_cell2arg) {
/* The first argument might be a cell. */
n = PyTuple_GET_SIZE(co->co_cellvars);
for (i = 0; i < n; i++) {
if (co->co_cell2arg[i] == 0) {
PyObject *cell = f->f_localsplus[co->co_nlocals + i];
assert(PyCell_Check(cell));
obj = PyCell_GET(cell);
break;
}
}
}
if (obj == NULL) {
PyErr_SetString(PyExc_RuntimeError,