diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-08 06:39:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 06:39:37 -0800 |
| commit | 25555e0fbed15f809a247c7e16ab9d0a0088f806 (patch) | |
| tree | ea790ba8966889dc230ebe1f22c0321ea331e605 /Python | |
| parent | 12b9fb603eea9298c835bae5b8742db4fa52892e (diff) | |
| download | cpython-git-25555e0fbed15f809a247c7e16ab9d0a0088f806.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 'Python')
| -rw-r--r-- | Python/ceval.c | 4 | ||||
| -rw-r--r-- | Python/sysmodule.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 50834f82c7..38d1d73845 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5500,7 +5500,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; @@ -5522,7 +5522,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 b09268b0e5..7d1493cbe1 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -2109,7 +2109,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; |
