diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-01-22 20:20:15 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-01-22 20:20:15 +0000 |
| commit | 12b813b5895cae579e403dafe43878868f27fe0f (patch) | |
| tree | aafceebff5feeaa2f76b0e7f59dd1e479464c7ab /Src/builtin.c | |
| parent | 99f42d8ce022645dfc38b8e06d25ab281e995cf9 (diff) | |
| download | zsh-12b813b5895cae579e403dafe43878868f27fe0f.tar.gz zsh-12b813b5895cae579e403dafe43878868f27fe0f.tar.xz zsh-12b813b5895cae579e403dafe43878868f27fe0f.zip | |
34331: better handling of NULL in cd.
Problem was return from symbolic link expander in weird cases where there file system isn't behaving itself properly.
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index 1818941b2..08be1acdd 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -1156,9 +1156,11 @@ cd_new_pwd(int func, LinkNode dir, int quiet) zsfree(getlinknode(dirstack)); if (chasinglinks) { - s = new_pwd; - new_pwd = findpwd(s); - zsfree(s); + s = findpwd(new_pwd); + if (s) { + zsfree(new_pwd); + new_pwd = s; + } } if (isset(PUSHDIGNOREDUPS)) { LinkNode n; |