From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 499 invoked by alias); 25 Jan 2015 17:32:21 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 34382 Received: (qmail 8162 invoked from network); 25 Jan 2015 17:32:19 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 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== X-Received: by 10.152.21.228 with SMTP id y4mr17531348lae.72.1422207136958; Sun, 25 Jan 2015 09:32:16 -0800 (PST) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: Handle NULL return from dlerror() more gracefully Date: Sun, 25 Jan 2015 18:32:10 +0100 Message-Id: <1422207130-24907-1-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 2.2.0.GIT Found by Daniel Hahler on irc, > module_path=() ; zmodload -F zsh/stat b:zstat 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