From 2fd4c5833831bf35091f22d388cbea02c552308f Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Tue, 4 Feb 2014 15:37:45 -0600 Subject: [PATCH] dladdr() on Win32 should't leave dli_fname == NULL --- lib/roken/dlfcn_w32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/roken/dlfcn_w32.c b/lib/roken/dlfcn_w32.c index 837e9e4e4..c5f71b33c 100644 --- a/lib/roken/dlfcn_w32.c +++ b/lib/roken/dlfcn_w32.c @@ -170,6 +170,7 @@ dladdr(void *addr, Dl_info *dli) DWORD nsize; memset(dli, 0, sizeof(*dli)); + dli->dli_fname = dli->_dli_buf; if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, @@ -180,7 +181,5 @@ dladdr(void *addr, Dl_info *dli) dli->_dli_buf[sizeof(dli->_dli_buf) - 1] = '\0'; if (nsize >= sizeof(dli->_dli_buf)) return 0; /* truncated? can't be... */ - - dli->dli_fname = dli->_dli_buf; return 1; }