diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-03-03 22:11:37 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-03-03 22:11:37 +0000 |
| commit | d60f73f7081a327fc6d6b9f988c763ab7b228f74 (patch) | |
| tree | 3f5abcbd88b93a5f9b87867cb071f087b3516ec2 /Src/exec.c | |
| parent | a3e73c8d05526b8c9d0735cfe747411567784a83 (diff) | |
| download | zsh-d60f73f7081a327fc6d6b9f988c763ab7b228f74.tar.gz zsh-d60f73f7081a327fc6d6b9f988c763ab7b228f74.tar.xz zsh-d60f73f7081a327fc6d6b9f988c763ab7b228f74.zip | |
26686: problem storing long $_ using VARARR()
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Src/exec.c b/Src/exec.c index b86e5350c..ed7c08759 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -4431,10 +4431,12 @@ doshfunc(Shfunc shfunc, LinkList doshargs, int noreturnval) mod_export void runshfunc(Eprog prog, FuncWrap wrap, char *name) { - int cont; - VARARR(char, ou, underscoreused); + int cont, ouu; + char *ou; - memcpy(ou, underscore, underscoreused); + ou = zalloc(ouu = underscoreused); + if (ou) + memcpy(ou, underscore, underscoreused); while (wrap) { wrap->module->wrapper++; @@ -4445,13 +4447,19 @@ runshfunc(Eprog prog, FuncWrap wrap, char *name) (wrap->module->node.flags & MOD_UNLOAD)) unload_module(wrap->module); - if (!cont) + if (!cont) { + if (ou) + zfree(ou, ouu); return; + } wrap = wrap->next; } startparamscope(); execode(prog, 1, 0); - setunderscore(ou); + if (ou) { + setunderscore(ou); + zfree(ou, ouu); + } endparamscope(); } |