bpo-38823: Clean up refleaks in _tkinter initialization. (GH-17206)

brandtbucher · miss-islington · commit 289cf0fbf78c · 2019-11-18T06:52:36.000-08:00
https://bugs.python.org/issue38823
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -3555,11 +3555,13 @@ PyInit__tkinter(void)
             if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
                 str_path = _get_tcl_lib_path();
                 if (str_path == NULL && PyErr_Occurred()) {
+                    Py_DECREF(m);
                     return NULL;
                 }
                 if (str_path != NULL) {
                     wcs_path = PyUnicode_AsWideCharString(str_path, NULL);
                     if (wcs_path == NULL) {
+                        Py_DECREF(m);
                         return NULL;
                     }
                     SetEnvironmentVariableW(L"TCL_LIBRARY", wcs_path);

Original file line number	Diff line number	Diff line change
`@@ -3555,11 +3555,13 @@ PyInit__tkinter(void)`
`3555`	`3555`	`if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {`
`3556`	`3556`	`str_path = _get_tcl_lib_path();`
`3557`	`3557`	`if (str_path == NULL && PyErr_Occurred()) {`
	`3558`	`+ Py_DECREF(m);`
`3558`	`3559`	`return NULL;`
`3559`	`3560`	`}`
`3560`	`3561`	`if (str_path != NULL) {`
`3561`	`3562`	`wcs_path = PyUnicode_AsWideCharString(str_path, NULL);`
`3562`	`3563`	`if (wcs_path == NULL) {`
	`3564`	`+ Py_DECREF(m);`
`3563`	`3565`	`return NULL;`
`3564`	`3566`	`}`
`3565`	`3567`	`SetEnvironmentVariableW(L"TCL_LIBRARY", wcs_path);`