diff options
| author | Peter Stephenson <pws@zsh.org> | 2017-06-13 15:41:00 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2017-06-13 15:41:00 +0100 |
| commit | eb783754bdb74377f3cea4ceca9c23a02ea1bf58 (patch) | |
| tree | 3e0a35c59c8f624d06e979edba8f2aa364bb3aea | |
| parent | d5c22d356ba442fd5811e15cc35b5480008722f4 (diff) | |
| download | zsh-eb783754bdb74377f3cea4ceca9c23a02ea1bf58.tar.gz zsh-eb783754bdb74377f3cea4ceca9c23a02ea1bf58.tar.xz zsh-eb783754bdb74377f3cea4ceca9c23a02ea1bf58.zip | |
41284: Fix NULL dereference in cd.
This happened in sh compatiblity mode if HOME was not set and cd was used with no argument.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/builtin.c | 11 | ||||
| -rw-r--r-- | Test/B01cd.ztst | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 73fbe1c2b..73d87ee62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-06-13 Peter Stephenson <p.stephenson@samsung.com> + + * 41284: Src/builtin.c, Test/B01cd.ztst: fix null dereference on + cd with no argument if HOME is not set. + 2017-06-12 Peter Stephenson <p.stephenson@samsung.com> * 41244: Doc/Zsh/builtins.yo, Src/Modules/zftp.c, diff --git a/Src/builtin.c b/Src/builtin.c index 0b3949437..2e72ba20a 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -880,8 +880,13 @@ cd_get_dest(char *nam, char **argv, int hard, int func) dir = nextnode(firstnode(dirstack)); if (dir) zinsertlinknode(dirstack, dir, getlinknode(dirstack)); - else if (func != BIN_POPD) + else if (func != BIN_POPD) { + if (!home) { + zwarnnam(nam, "HOME not set"); + return NULL; + } zpushnode(dirstack, ztrdup(home)); + } } else if (!argv[1]) { int dd; char *end; @@ -936,6 +941,10 @@ cd_get_dest(char *nam, char **argv, int hard, int func) if (!dir) { dir = firstnode(dirstack); } + if (!dir || !getdata(dir)) { + DPUTS(1, "Directory not set, not detected early enough"); + return NULL; + } if (!(dest = cd_do_chdir(nam, getdata(dir), hard))) { if (!target) zsfree(getlinknode(dirstack)); diff --git a/Test/B01cd.ztst b/Test/B01cd.ztst index 94447e717..8d4f0955c 100644 --- a/Test/B01cd.ztst +++ b/Test/B01cd.ztst @@ -137,6 +137,10 @@ F:something is broken. But you already knew that. 0: ?(eval):cd:3: not a directory: link_to_nonexistent + (unset HOME; ARGV0=sh $ZTST_testdir/../Src/zsh -c cd) +1:Implicit cd with unset HOME. +?zsh:cd:1: HOME not set + %clean # This optional section cleans up after the test, if necessary, # e.g. killing processes etc. This is in addition to the removal of *.tmp |