summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2018-12-08 14:16:55 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2018-12-08 14:16:55 (GMT)
commit99d56b53560b3867844472ae381fb3f858760621 (patch)
treef81865ef12567f144d7eaf3adf8b61c136945a55 /Python
parentf05df0a4b679d0acfd0b1fe6187ba2d553b37afa (diff)
downloadcpython-99d56b53560b3867844472ae381fb3f858760621.zip
cpython-99d56b53560b3867844472ae381fb3f858760621.tar.gz
cpython-99d56b53560b3867844472ae381fb3f858760621.tar.bz2
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().
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 a4273ad..7ffc68a 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -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;
@@ -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
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 0ca3de3..49fa384 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -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;