about summary refs log tree commit diff
path: root/Src/exec.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2017-01-11 12:11:22 +0000
committerPeter Stephenson <pws@zsh.org>2017-01-11 12:11:22 +0000
commit47b7f2adef9d7e399af9d06a67b4db1ad55d4f32 (patch)
tree62956db751e1bfe226bae4d5b14c075ca8871c4d /Src/exec.c
parentf26d1ba6b01a358c83f28219c7a01e546e84d2ee (diff)
downloadzsh-47b7f2adef9d7e399af9d06a67b4db1ad55d4f32.tar.gz
zsh-47b7f2adef9d7e399af9d06a67b4db1ad55d4f32.tar.xz
zsh-47b7f2adef9d7e399af9d06a67b4db1ad55d4f32.zip
unposted: more care with shell function filename.
When updating shfunc structure to change filename we should be
careful to free whatever's there already, we may now be the
directory in which to find the function definition.  After loading
the field contains the full name of the file.
Diffstat (limited to 'Src/exec.c')
-rw-r--r--Src/exec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Src/exec.c b/Src/exec.c
index a41d05b41..7bec7ce48 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -5204,6 +5204,7 @@ loadautofn(Shfunc shf, int fksh, int autol, int current_fpath)
 	    else
 		shf->funcdef = dupeprog(prog, 0);
 	    shf->node.flags &= ~PM_UNDEFINED;
+	    zsfree(shf->filename);
 	    shf->filename = fname;
 	} else {
 	    VARARR(char, n, strlen(shf->node.nam) + 1);
@@ -5227,6 +5228,7 @@ loadautofn(Shfunc shf, int fksh, int autol, int current_fpath)
 	else
 	    shf->funcdef = dupeprog(stripkshdef(prog, shf->node.nam), 0);
 	shf->node.flags &= ~PM_UNDEFINED;
+	zsfree(shf->filename);
 	shf->filename = fname;
     }
     popheap();