diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-08 06:34:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 06:34:49 -0800 |
| commit | 8b7d8ac09cc0f736d0c3a39d838814d7ae253021 (patch) | |
| tree | 5e80bc867b3006ae65fe88bba33b285072b7acea /Modules/selectmodule.c | |
| parent | ee2c5a8e2dcf662048dbcf4e49af9b4aaf81f7d3 (diff) | |
| download | cpython-git-8b7d8ac09cc0f736d0c3a39d838814d7ae253021.tar.gz | |
bpo-35441: Remove dead and buggy code related to PyList_SetItem(). (GH-11033)
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().
(cherry picked from commit 99d56b53560b3867844472ae381fb3f858760621)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Diffstat (limited to 'Modules/selectmodule.c')
| -rw-r--r-- | Modules/selectmodule.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 88679e8144..93d896a37c 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -652,10 +652,7 @@ poll_poll(pollObject *self, PyObject *args) 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; @@ -981,10 +978,7 @@ devpoll_poll(devpollObject *self, PyObject *args) 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; |