commit 8b7d8ac09cc0f736d0c3a39d838814d7ae253021
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sat Dec 08 06:34:49 2018 -0800
committer GitHub <noreply@github.com> Sat Dec 08 06:34:49 2018 -0800
tree 5e80bc867b3006ae65fe88bba33b285072b7acea
parent ee2c5a8e2dcf662048dbcf4e49af9b4aaf81f7d3

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>

PC/winreg.c

diff --git a/PC/winreg.c b/PC/winreg.c
index ddaf3b1..6f31066 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -757,9 +757,13 @@
                         PyMem_Free(str);
                         return NULL;
                     }
-                    PyList_SetItem(obData,
-                                   index,
-                                   PyUnicode_FromWideChar(str[index], len));
+                    PyObject *uni = PyUnicode_FromWideChar(str[index], len);
+                    if (uni == NULL) {
+                        Py_DECREF(obData);
+                        PyMem_Free(str);
+                        return NULL;
+                    }
+                    PyList_SET_ITEM(obData, index, uni);
                 }
                 PyMem_Free(str);