about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-02-19 08:26:03 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2015-02-19 08:26:03 -0800
commitdf7a657b10df436e88a4c293cdfa5c7b156fba72 (patch)
treeba7fce16e01db3709b62ff0857289df9723b2470
parentf36f6208bf03511905d423d51ffa1d8426022ba1 (diff)
downloadzsh-df7a657b10df436e88a4c293cdfa5c7b156fba72.tar.gz
zsh-df7a657b10df436e88a4c293cdfa5c7b156fba72.tar.xz
zsh-df7a657b10df436e88a4c293cdfa5c7b156fba72.zip
34568: use META_HEAPDUP when passing dlerror() string to metafy()
-rw-r--r--ChangeLog5
-rw-r--r--Src/module.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26a10147a..c4ff0223e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-19  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 34568: Src/Module.c: use META_HEAPDUP when passing dlerror()
+	string to metafy()
+
 2015-02-19  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* unposted: Config/version.mk: Mikael says it's 2015,
diff --git a/Src/module.c b/Src/module.c
index 7dd47016c..368254c29 100644
--- a/Src/module.c
+++ b/Src/module.c
@@ -1601,7 +1601,7 @@ do_load_module(char const *name, int silent)
 #ifdef HAVE_DLERROR
 	char *errstr = dlerror();
 	zwarn("failed to load module `%s': %s", name,
-	      errstr ? metafy(errstr, -1, META_USEHEAP) : "empty module path");
+	      errstr ? metafy(errstr, -1, META_HEAPDUP) : "empty module path");
 #else
 	zwarn("failed to load module: %s", name);
 #endif