common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

find-dynamic-foreign-symbol-address: look in *shared-objects* first.

Browse source 
*runtime-dlhandle* on some BSDs wil actually search all symbols and
might pick up the wrong thing. E.g. on macOS a DNS resolver loads a
different SSL library that will conflict with cl+ssl.
This commit is contained in:
Stas Boukarev 2025-04-03 19:45:59 +03:00
parent fd5e62ca74
commit 0be0e832cd
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/code/unix-foreign-load.lisp
View file

@ -66,21 +66,23 @@
(defun find-dynamic-foreign-symbol-address (symbol)
(dlerror) ; clear old errors
(unless *runtime-dlhandle*
(bug "Cannot resolve foreign symbol: lost *runtime-dlhandle*"))
;; On real ELF & dlsym platforms the EXTERN-ALIEN-NAME is a no-op,
;; but on platforms where dlsym is simulated we use the mangled name.
(let* ((extern (extern-alien-name symbol))
(result (sap-int (dlsym *runtime-dlhandle* extern)))
(err (dlerror)))
(if (or (not (zerop result)) (not err))
result
(dolist (obj *shared-objects*)
(let ((sap (shared-object-handle obj)))
(when sap
(setf result (sap-int (dlsym sap extern))
err (dlerror))
(when (or (not (zerop result)) (not err))
(return result))))))))
(let* ((extern (extern-alien-name symbol)))
(flet ((sym (handle)
(let ((result (sap-int (dlsym handle extern)))
(err (dlerror)))
(when (or (not (zerop result)) (not err))
(return-from find-dynamic-foreign-symbol-address result)))))
;; Search the loaded libraries first, *runtime-dlhandle* on some
;; BSDs will actually search all symbols and might pick up the wrong
;; thing.
(dolist (obj *shared-objects*)
(let ((handle (shared-object-handle obj)))
(when handle
(sym handle))))
(unless *runtime-dlhandle*
(bug "Cannot resolve foreign symbol: lost *runtime-dlhandle*"))
(sym *runtime-dlhandle*))))