MERGE: Closes python#20908: Memory leak in Reg2Py()

swtaarrs · Mar 13, 2014 · 58c767f · 58c767f
2 parents d73721a + 782c4cf
commit 58c767f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/PC/winreg.c b/PC/winreg.c
@@ -943,15 +943,18 @@ Reg2Py(BYTE *retDataBuf, DWORD retDataSize, DWORD typ)
 
                 fixupMultiSZ(str, data, len);
                 obData = PyList_New(s);
-                if (obData == NULL)
+                if (obData == NULL) {
+                    free(str);
                     return NULL;
+                }
                 for (index = 0; index < s; index++)
                 {
                     size_t len = wcslen(str[index]);
                     if (len > INT_MAX) {
                         PyErr_SetString(PyExc_OverflowError,
                             "registry string is too long for a Python string");
                         Py_DECREF(obData);
+                        free(str);
                         return NULL;
                     }
                     PyList_SetItem(obData,