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

miss-islington · brandtbucher · web-flow · commit 9e4d0312101c · 2019-11-18T07:09:43.000-08:00
https://bugs.python.org/issue38823 (cherry picked from commit 289cf0f) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -3552,11 +3552,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
`@@ -3552,11 +3552,13 @@ PyInit__tkinter(void)`
`3552`	`3552`	`if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {`
`3553`	`3553`	`str_path = _get_tcl_lib_path();`
`3554`	`3554`	`if (str_path == NULL && PyErr_Occurred()) {`
	`3555`	`+ Py_DECREF(m);`
`3555`	`3556`	`return NULL;`
`3556`	`3557`	`}`
`3557`	`3558`	`if (str_path != NULL) {`
`3558`	`3559`	`wcs_path = PyUnicode_AsWideCharString(str_path, NULL);`
`3559`	`3560`	`if (wcs_path == NULL) {`
	`3561`	`+ Py_DECREF(m);`
`3560`	`3562`	`return NULL;`
`3561`	`3563`	`}`
`3562`	`3564`	`SetEnvironmentVariableW(L"TCL_LIBRARY", wcs_path);`