diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-06-16 16:57:32 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-06-16 17:02:53 -0700 |
| commit | 19b37ef565072abcbea02cfa4d0295b49f41cfe2 (patch) | |
| tree | 771bee7b7407fab7a2cd54d1e1c00550de2c1a06 | |
| parent | 54c2c442eeee46b28d5596e7e83812df01d1f13f (diff) | |
| download | zsh-19b37ef565072abcbea02cfa4d0295b49f41cfe2.tar.gz zsh-19b37ef565072abcbea02cfa4d0295b49f41cfe2.tar.xz zsh-19b37ef565072abcbea02cfa4d0295b49f41cfe2.zip | |
35482: be consistent about how argzero is allocated
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/init.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index cb3b5e78d..36c73eb5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * 35477: Completion/Unix/Command/_gdb: _gdb: Allow 'core' to occur anywhere in a coredump filename +2015-06-16 Barton E. Schaefer <schaefer@zsh.org> + + * 35482: Src/init.c: be consistent about how argzero is allocated + 2015-06-14 Barton E. Schaefer <schaefer@zsh.org> * 35469: Functions/Zle/smart-insert-last-word: test UNDO_CHANGE_NO diff --git a/Src/init.c b/Src/init.c index 102276a64..0fe4d758c 100644 --- a/Src/init.c +++ b/Src/init.c @@ -1117,8 +1117,9 @@ setupshin(char *runscript) exit(127); } scriptfilename = sfname; - zsfree(argzero); /* ztrdup'd in parseargs */ - argzero = runscript; + sfname = argzero; /* copy to avoid race condition */ + argzero = ztrdup(runscript); + zsfree(sfname); /* argzero ztrdup'd in parseargs */ } /* * We only initialise line numbering once there is a script to |