From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Thu, 5 Mar 2026 14:34:49 +0000 (+0100) Subject: [3.13] gh-143304: Fix ctypes.CDLL to honor handle parameter on POSIX systems (GH... X-Git-Tag: v3.13.13~132 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fab30ed1125f020f3a050c1a055d3ffcd816811;p=thirdparty%2FPython%2Fcpython.git [3.13] gh-143304: Fix ctypes.CDLL to honor handle parameter on POSIX systems (GH-143318) (GH-145173) The handle parameter was being ignored in the POSIX implementation of CDLL._load_library(), causing it to always call _dlopen() even when a valid handle was provided. This was a regression introduced in recent refactoring. (cherry picked from commit 27ded243485670fa836c9bb421e37a6ef16eca8e) Co-authored-by: Arjit Singh Grover <143692910+Koolvansh07@users.noreply.github.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> --- diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py index 80651dc64ce7..7fc1181f25a2 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -398,6 +398,8 @@ class CDLL(object): if name and name.endswith(")") and ".a(" in name: mode |= _os.RTLD_MEMBER | _os.RTLD_NOW self._name = name + if handle is not None: + return handle return _dlopen(name, mode) def __repr__(self): diff --git a/Lib/test/test_ctypes/test_loading.py b/Lib/test/test_ctypes/test_loading.py index a4d54f676a6d..dc10d61f2bc6 100644 --- a/Lib/test/test_ctypes/test_loading.py +++ b/Lib/test/test_ctypes/test_loading.py @@ -106,6 +106,14 @@ class LoaderTest(unittest.TestCase): lib = ctypes.WinDLL(name=None, handle=handle) self.assertIs(handle, lib._handle) + @unittest.skipIf(os.name == "nt", 'POSIX-specific test') + @unittest.skipIf(libc_name is None, 'could not find libc') + def test_load_without_name_and_with_handle_posix(self): + lib1 = CDLL(libc_name) + handle = lib1._handle + lib2 = CDLL(name=None, handle=handle) + self.assertIs(lib2._handle, handle) + @unittest.skipUnless(os.name == "nt", 'Windows-specific test') def test_1703286_A(self): # On winXP 64-bit, advapi32 loads at an address that does diff --git a/Misc/NEWS.d/next/Library/2026-01-01-05-26-00.gh-issue-143304.Kv7x9Q.rst b/Misc/NEWS.d/next/Library/2026-01-01-05-26-00.gh-issue-143304.Kv7x9Q.rst new file mode 100644 index 000000000000..826b2e9a126d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-01-01-05-26-00.gh-issue-143304.Kv7x9Q.rst @@ -0,0 +1 @@ +Fix :class:`ctypes.CDLL` to honor the ``handle`` parameter on POSIX systems.