mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-11 00:51:05 +02:00
Code Releases Activity

29503: Missing popheap() on failed autoload

Browse source
This commit is contained in:
Peter Stephenson 2011-06-23 19:29:24 +00:00
parent ccc76c933f
commit e1680e6840
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,7 @@
2011-06-23 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 29503: Src/exec.c: Missing popheap() on failed autoload.
2011-06-20 Peter Stephenson <pws@csr.com> 2011-06-20 Peter Stephenson <pws@csr.com>
* unposted: update version to 4.3.12-dev-1 as wordcode * unposted: update version to 4.3.12-dev-1 as wordcode
@ -15038,5 +15042,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5379 $ * $Revision: 1.5380 $
***************************************************** *****************************************************

4
Src/Zle/zle_tricky.c
View file

@ -2146,10 +2146,6 @@ doexpansion(char *s, int lst, int olst, int explincmd)
ss = quotename(ss, NULL); ss = quotename(ss, NULL);
untokenize(ss); untokenize(ss);
inststr(ss); inststr(ss);
#if 0
if (olst != COMP_EXPAND_COMPLETE || nonempty(vl) ||
(zlemetacs && zlemetaline[zlemetacs-1] != '/')) {
#endif
if (nonempty(vl) || !first) { if (nonempty(vl) || !first) {
spaceinline(1); spaceinline(1);
zlemetaline[zlemetacs++] = ' '; zlemetaline[zlemetacs++] = ' ';

1
Src/exec.c
View file

@ -4343,6 +4343,7 @@ loadautofn(Shfunc shf, int fksh, int autol)
} }
if (!prog) { if (!prog) {
zsfree(fname); zsfree(fname);
popheap();
return NULL; return NULL;
} }
if (ksh == 2 || (ksh == 1 && isset(KSHAUTOLOAD))) { if (ksh == 2 || (ksh == 1 && isset(KSHAUTOLOAD))) {