Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 8, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2b6cd
bpo-35441: Remove dead and buggy code related to PyList_SetItem()
ZackerySpytz Dec 8, 2018
2a9bb21
Address the review comment.
ZackerySpytz Dec 8, 2018
6268718
Check if the list changed size in the loop in array_array_fromlist()
ZackerySpytz Dec 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions Modules/_localemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,13 @@ copy_grouping(const char* s)
do {
i++;
val = PyLong_FromLong(s[i]);
if (!val)
break;
if (PyList_SetItem(result, i, val)) {
Py_DECREF(val);
val = NULL;
break;
if (val == NULL) {
Py_DECREF(result);
return NULL;
}
PyList_SET_ITEM(result, i, val);
} while (s[i] != '\0' && s[i] != CHAR_MAX);

if (!val) {
Py_DECREF(result);
return NULL;
}

return result;
}

Expand Down
11 changes: 8 additions & 3 deletions Modules/arraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is possible the the list change size when convert its items to C integers. PyList_GetItem() can return NULL.

Needed to check either that v != NULL, or that n == PyList_GET_SIZE() in a loop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. As this is a bug in the existing code, can I simply revert this change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is up to you. Either revert this change and create a separate PR for fixing this bug, or include a fix for it in this PR.

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;
Expand All @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions Modules/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,8 +936,7 @@ on_completion_display_matches_hook(char **matches,
s = decode(matches[i+1]);
if (s == NULL)
goto error;
if (PyList_SetItem(m, i, s) == -1)
goto error;
PyList_SET_ITEM(m, i, s);
}
sub = decode(matches[0]);
r = PyObject_CallFunction(readlinestate_global->completion_display_matches_hook,
Expand Down
10 changes: 2 additions & 8 deletions Modules/selectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,10 +693,7 @@ select_poll_poll_impl(pollObject *self, PyObject *timeout_obj)
goto error;
}
PyTuple_SET_ITEM(value, 1, num);
if ((PyList_SetItem(result_list, j, value)) == -1) {
Py_DECREF(value);
goto error;
}
PyList_SET_ITEM(result_list, j, value);
i++;
}
return result_list;
Expand Down Expand Up @@ -986,10 +983,7 @@ select_devpoll_poll_impl(devpollObject *self, PyObject *timeout_obj)
Py_DECREF(num2);
if (value == NULL)
goto error;
if ((PyList_SetItem(result_list, i, value)) == -1) {
Py_DECREF(value);
goto error;
}
PyList_SET_ITEM(result_list, i, value);
}

return result_list;
Expand Down
10 changes: 7 additions & 3 deletions PC/winreg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,9 +756,13 @@ Reg2Py(BYTE *retDataBuf, DWORD retDataSize, DWORD typ)
PyMem_Free(str);
return NULL;
}
PyList_SetItem(obData,
index,
PyUnicode_FromWideChar(str[index], len));
PyObject *uni = PyUnicode_FromWideChar(str[index], len);
if (uni == NULL) {
Py_DECREF(obData);
PyMem_Free(str);
return NULL;
}
PyList_SET_ITEM(obData, index, uni);
}
PyMem_Free(str);

Expand Down
4 changes: 2 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5124,7 +5124,7 @@ getarray(long a[256])
Py_DECREF(l);
return NULL;
}
PyList_SetItem(l, i, x);
PyList_SET_ITEM(l, i, x);
}
for (i = 0; i < 256; i++)
a[i] = 0;
Expand All @@ -5146,7 +5146,7 @@ _Py_GetDXProfile(PyObject *self, PyObject *args)
Py_DECREF(l);
return NULL;
}
PyList_SetItem(l, i, x);
PyList_SET_ITEM(l, i, x);
}
return l;
#endif
Expand Down
2 changes: 1 addition & 1 deletion Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2594,7 +2594,7 @@ makepathobject(const wchar_t *path, wchar_t delim)
Py_DECREF(v);
return NULL;
}
PyList_SetItem(v, i, w);
PyList_SET_ITEM(v, i, w);
if (*p == '\0')
break;
path = p+1;
Expand Down