mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 21:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-35441: Remove dead and buggy code related to PyList_SetItem(). (GH-11033)

Browse source 
In _localemodule.c and selectmodule.c, remove dead code that would
cause double decrefs if run.

In addition, replace PyList_SetItem() with PyList_SET_ITEM() in cases
where a new list is populated and there is no possibility of an error.

In addition, check if the list changed size in the loop in array_array_fromlist().
This commit is contained in:
Zackery Spytz 2018-12-08 07:16:55 -07:00 • committed by Serhiy Storchaka
parent f05df0a4b6
commit 99d56b5356
7 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/arraymodule.c
View file

@ -1544,12 +1544,18 @@ array_array_fromlist(arrayobject *self, PyObject *list)
if (array_resize(self, old_size + n) == -1)
return NULL;
for (i = 0; i < n; i++) {
PyObject *v = PyList_GetItem(list, i);
PyObject *v = PyList_GET_ITEM(list, i);
if ((*self->ob_descr->setitem)(self,
Py_SIZE(self) - n + i, v) != 0) {
array_resize(self, old_size);
return NULL;
}
if (n != PyList_GET_SIZE(list)) {
PyErr_SetString(PyExc_RuntimeError,
"list changed size during iteration");
array_resize(self, old_size);
return NULL;
}
}
}
Py_RETURN_NONE;
@ -1574,8 +1580,7 @@ array_array_tolist_impl(arrayobject *self)
PyObject *v = getarrayitem((PyObject *)self, i);
if (v == NULL)
goto error;
if (PyList_SetItem(list, i, v) < 0)
goto error;
PyList_SET_ITEM(list, i, v);
}
return list;