Merge pull request #17404 from anntzer/dlclose

QuLogic · web-flow · commit 9ebcbc1e48e9 · 2020-05-14T19:19:50.000-04:00
Don't forget to dlclose() main_program in tkagg init.
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -161,7 +161,7 @@ void load_tkinter_funcs(void)
 void load_tkinter_funcs(void)
 {
     // Load tkinter global funcs from tkinter compiled module.
-    void *main_program, *tkinter_lib;
+    void *main_program = NULL, *tkinter_lib = NULL;
     PyObject *module = NULL, *py_path = NULL, *py_path_b = NULL;
     char *path;
 
@@ -190,11 +190,18 @@ void load_tkinter_funcs(void)
         PyErr_SetString(PyExc_RuntimeError, dlerror());
         goto exit;
     }
-    load_tk(tkinter_lib);
-    // dlclose is safe because tkinter has been imported.
-    dlclose(tkinter_lib);
-    goto exit;
+    if (load_tk(tkinter_lib)) {
+        goto exit;
+    }
+
 exit:
+    // We don't need to keep a reference open as the main program & tkinter
+    // have been imported.  Use a non-short-circuiting "or" to try closing both
+    // handles before handling errors.
+    if ((main_program && dlclose(main_program))
+        | (tkinter_lib && dlclose(tkinter_lib))) {
+        PyErr_SetString(PyExc_RuntimeError, dlerror());
+    }
     Py_XDECREF(module);
     Py_XDECREF(py_path);
     Py_XDECREF(py_path_b);
