Merge pull request #25858 from anntzer/dc

ksunden · web-flow · commit 01cfd30b7657 · 2023-06-02T23:11:41.000-05:00
Get dlerror() immediately after dlclose() fails.
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -324,11 +324,16 @@ void load_tkinter_funcs(void)
 
 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))) {
+    // have been imported.  Try to close each library separately (otherwise the
+    // second dlclose could clear a dlerror from the first dlclose).
+    bool raised_dlerror = false;
+    if (main_program && dlclose(main_program) && !raised_dlerror) {
         PyErr_SetString(PyExc_RuntimeError, dlerror());
+        raised_dlerror = true;
+    }
+    if (tkinter_lib && dlclose(tkinter_lib) && !raised_dlerror) {
+        PyErr_SetString(PyExc_RuntimeError, dlerror());
+        raised_dlerror = true;
     }
     Py_XDECREF(module);
     Py_XDECREF(py_path);
