loader: prevent local directory from shadowing system library (#5182)

* loader: prevent local directory from shadowing system library When loading a system dynamic library via ctypes.CDLL() in a frozen progam, a local directory in sys._MEIPASS with a clashing basename ends up preventing the library from being loaded. To fix this, use an os.path.isdir() to decide whether to use frozen or original library name. Fixes #5178. * Added news fragment for PR.
pyinstaller · Sep 22, 2020 · bfc8b08 · bfc8b08
1 parent 9001222
commit bfc8b08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/PyInstaller/loader/pyiboot01_bootstrap.py b/PyInstaller/loader/pyiboot01_bootstrap.py
@@ -126,7 +126,7 @@ def isatty(self):
     def _frozen_name(name):
         if name:
             frozen_name = os.path.join(sys._MEIPASS, os.path.basename(name))
-            if os.path.exists(frozen_name):
+            if os.path.exists(frozen_name) and not os.path.isdir(frozen_name):
                 name = frozen_name
         return name
 

diff --git a/news/5182.core.rst b/news/5182.core.rst
@@ -0,0 +1 @@
+Prevent a local directory with clashing name from shadowing a system library.