Merge pull request gevent#1842 from gevent/issue1814

Updated 1814
th0114nd · Dec 7, 2021 · e5c31fe · e5c31fe
2 parents ecf874c + 43da323
commit e5c31fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/docs/changes/1814.bugfix b/docs/changes/1814.bugfix
@@ -0,0 +1 @@
+Try to avoid linking to two different Python runtime DLLs on Windows.
diff --git a/src/gevent/libuv/_corecffi_build.py b/src/gevent/libuv/_corecffi_build.py
@@ -276,6 +276,15 @@ def _add_library(name):
     if os.uname().sysname != 'OS400':
         _add_library('perfstat')
 elif WIN:
+    # All other gevent .pyd files link to the specific minor-version Python
+    # DLL, so we should do the same here. In virtual environments that don't
+    # contain the major-version python?.dll stub, _corecffi.pyd would otherwise
+    # cause the Windows DLL loader to search the entire PATH for a DLL with
+    # that name. This might end up bringing a second, ABI-incompatible Python
+    # version into the process, which can easily lead to crashes.
+    # See https://github.com/gevent/gevent/pull/1814/files
+    _define_macro('_CFFI_NO_LIMITED_API', 1)
+
     _define_macro('_GNU_SOURCE', 1)
     _define_macro('WIN32', 1)
     _define_macro('_CRT_SECURE_NO_DEPRECATE', 1)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Try to avoid linking to two different Python runtime DLLs on Windows.