From 8b7d8ac09cc0f736d0c3a39d838814d7ae253021 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 8 Dec 2018 06:34:49 -0800 Subject: 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 --- Python/ceval.c | 4 ++-- Python/sysmodule.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Python') diff --git a/Python/ceval.c b/Python/ceval.c index 0d1519bef4..e371d345cc 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5056,7 +5056,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; @@ -5078,7 +5078,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 diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 498fa91fcc..f04403b76a 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -2544,7 +2544,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; -- cgit v1.2.1