[Python-checkins] bpo-38823: Clean up refleaks in _tkinter initialization. (GH-17206)

Miss Islington (bot) webhook-mailer at python.org
Mon Nov 18 09:52:48 EST 2019


https://github.com/python/cpython/commit/289cf0fbf78c4f38c38ac71ac8b772be7ec2672f
commit: 289cf0fbf78c4f38c38ac71ac8b772be7ec2672f
branch: master
author: Brandt Bucher <brandtbucher at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-11-18T06:52:36-08:00
summary:

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



https://bugs.python.org/issue38823

files:
M Modules/_tkinter.c

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 235cb6bc28dd5..40d2ed7f88b11 100644
--- 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);



More information about the Python-checkins mailing list