From 478bcfe52a653bf338f17690147fa9f5793f5b42 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Sun, 8 Dec 2019 19:25:45 +0100 Subject: [PATCH] FFI: Workaround for platform dlerror() returning NULL. Contributed by mcclure. --- src/lj_clib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lj_clib.c b/src/lj_clib.c index 8dc3c10e..dc72dced 100644 --- a/src/lj_clib.c +++ b/src/lj_clib.c @@ -118,12 +118,13 @@ static void *clib_loadlib(lua_State *L, const char *name, int global) RTLD_LAZY | (global?RTLD_GLOBAL:RTLD_LOCAL)); if (!h) { const char *e, *err = dlerror(); - if (*err == '/' && (e = strchr(err, ':')) && + if (err && *err == '/' && (e = strchr(err, ':')) && (name = clib_resolve_lds(L, strdata(lj_str_new(L, err, e-err))))) { h = dlopen(name, RTLD_LAZY | (global?RTLD_GLOBAL:RTLD_LOCAL)); if (h) return h; err = dlerror(); } + if (!err) err = "dlopen failed"; lj_err_callermsg(L, err); } return h;