Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: Handle NULL return from dlerror() more gracefully

X-seq: zsh-workers 34382
From: Mikael Magnusson <mikachu@xxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: PATCH: Handle NULL return from dlerror() more gracefully
Date: Sun, 25 Jan 2015 18:32:10 +0100
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=KJMMUjF9v0Pha9ZReumSana/7pdNqkDcnFL2+VI2Bi8=; b=g7niXo6nmDBXy9FLk3djtHbVjKmxuSZgMEpsdh56prE/BxKzznFN1khfwxb4WliMey 3qJ8xIV9dl9O+IKLcLpHi4cs1OJZcrmSHGcBxj0F1D832gbBjp9e9qjskNVposueAa2r KM5+rn6LDcTUWZVkxOIU5+r8VILrCeuH0SDEUD/6ucWWvMO6DZBzhA90nKOv6jS5k4at nGId/Gevn339McE/TkEqBPWojROvzJqYfTj0Ie7o03yI2gxGq90LtT69BHSEYfYL1FAY UtOgPMRzYF7ORkXBGKLCioHqtiRoqfeH7V5hrnjAYd1dE8U+oCpi1HTXG3M8GQwIhMPz SBvA==
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm

Found by Daniel Hahler on irc,
<blueyed> > module_path=() ; zmodload -F zsh/stat b:zstat
<SweetieBot> blueyed: zsh[239]: segfault at 0 ip 080be250 sp bfe11d20 error 4 in zsh[8048000+95000]

---
 Src/module.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Src/module.c b/Src/module.c
index 616207e..e78bd82 100644
--- a/Src/module.c
+++ b/Src/module.c
@@ -1596,8 +1596,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
-- 
2.2.0.GIT

Messages sorted by: Reverse Date, Date, Thread, Author