summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-12-08 06:34:49 -0800
committerGitHub <noreply@github.com>2018-12-08 06:34:49 -0800
commit8b7d8ac09cc0f736d0c3a39d838814d7ae253021 (patch)
tree5e80bc867b3006ae65fe88bba33b285072b7acea /Python
parentee2c5a8e2dcf662048dbcf4e49af9b4aaf81f7d3 (diff)
downloadcpython-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 'Python')
-rw-r--r--Python/ceval.c4
-rw-r--r--Python/sysmodule.c2
2 files changed, 3 insertions, 3 deletions
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;