diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2011-10-28 10:46:23 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2011-10-28 10:46:23 +0000 |
| commit | 6cd43e7d7021ded4e855cf5071186795e746ffab (patch) | |
| tree | 53027e86d86c5dd583c3a09cb4a280c33a106f28 | |
| parent | fe15a9e2bbf5b87962c0e4b2246e39f293ccf593 (diff) | |
| download | zsh-6cd43e7d7021ded4e855cf5071186795e746ffab.tar.gz zsh-6cd43e7d7021ded4e855cf5071186795e746ffab.tar.xz zsh-6cd43e7d7021ded4e855cf5071186795e746ffab.zip | |
29879: metafy dlerror message to avoid corruption
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/module.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index bbe820cfb..8739e7597 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-28 Peter Stephenson <pws@csr.com> + + * Src/module.c (do_load_module): 29879: (via takimoto-j): Metafy + dlerror message to avoid corruption. + 2011-10-26 Phil Pennock <pdpennock@users.sourceforge.net> * 29867: Bart Schaefer: Test/V07pcre.ztst: exit early with @@ -15517,5 +15522,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5488 $ +* $Revision: 1.5489 $ ***************************************************** diff --git a/Src/module.c b/Src/module.c index a5a6029b4..5cc595c47 100644 --- a/Src/module.c +++ b/Src/module.c @@ -1597,7 +1597,8 @@ do_load_module(char const *name, int silent) ret = try_load_module(name); if (!ret && !silent) { #ifdef HAVE_DLERROR - zwarn("failed to load module `%s': %s", name, dlerror()); + zwarn("failed to load module `%s': %s", name, + metafy(dlerror(), -1, META_USEHEAP)); #else zwarn("failed to load module: %s", name); #endif |