about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-06-23 19:29:24 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-06-23 19:29:24 +0000
commite1680e68409892a4737243fff9ea9b0043e99ea0 (patch)
tree86c97e0ffe5bd9709ba6964e1e67ff32d769434b /Src
parentccc76c933f41f24a596397af4c529486b71368aa (diff)
downloadzsh-e1680e68409892a4737243fff9ea9b0043e99ea0.tar.gz
zsh-e1680e68409892a4737243fff9ea9b0043e99ea0.tar.xz
zsh-e1680e68409892a4737243fff9ea9b0043e99ea0.zip
29503: Missing popheap() on failed autoload
Diffstat (limited to 'Src')
-rw-r--r--Src/Zle/zle_tricky.c4
-rw-r--r--Src/exec.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 3b3796dd2..19787f9ff 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -2146,10 +2146,6 @@ doexpansion(char *s, int lst, int olst, int explincmd)
 	ss = quotename(ss, NULL);
 	untokenize(ss);
 	inststr(ss);
-#if 0
-	if (olst != COMP_EXPAND_COMPLETE || nonempty(vl) ||
-	    (zlemetacs && zlemetaline[zlemetacs-1] != '/')) {
-#endif
 	if (nonempty(vl) || !first) {
 	    spaceinline(1);
 	    zlemetaline[zlemetacs++] = ' ';
diff --git a/Src/exec.c b/Src/exec.c
index 87a167ba6..644a58367 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -4343,6 +4343,7 @@ loadautofn(Shfunc shf, int fksh, int autol)
     }
     if (!prog) {
 	zsfree(fname);
+	popheap();
 	return NULL;
     }
     if (ksh == 2 || (ksh == 1 && isset(KSHAUTOLOAD))) {