summaryrefslogtreecommitdiffstats
path: root/PC/winreg.c
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 /PC/winreg.c
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 'PC/winreg.c')
-rw-r--r--PC/winreg.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/PC/winreg.c b/PC/winreg.c
index 0198097..4505c31 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -756,9 +756,13 @@ Reg2Py(BYTE *retDataBuf, DWORD retDataSize, DWORD typ)
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);