From bac2bbd05893dff4be88c7914116374c0f27932d Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 25 Jan 2015 18:28:50 +0100 Subject: 34382: Handle NULL return from dlerror() more gracefully --- ChangeLog | 5 +++++ Src/module.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc6264497..ff7c100f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-27 Mikael Magnusson + + * 34382: Src/module.c: Handle NULL return from dlerror() more + gracefully + 2015-01-26 Peter Stephenson * 34402: Src/Modules/db_gdbm.c: make unsetting a tied gdbm diff --git a/Src/module.c b/Src/module.c index bcc0ba833..97a4869cd 100644 --- a/Src/module.c +++ b/Src/module.c @@ -1597,8 +1597,9 @@ do_load_module(char const *name, int silent) ret = try_load_module(name); if (!ret && !silent) { #ifdef HAVE_DLERROR + char *errstr = dlerror(); zwarn("failed to load module `%s': %s", name, - metafy(dlerror(), -1, META_USEHEAP)); + errstr ? metafy(errstr, -1, META_USEHEAP) : "empty module path"); #else zwarn("failed to load module: %s", name); #endif -- cgit 1.4.1