From eb783754bdb74377f3cea4ceca9c23a02ea1bf58 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 13 Jun 2017 15:41:00 +0100 Subject: 41284: Fix NULL dereference in cd. This happened in sh compatiblity mode if HOME was not set and cd was used with no argument. --- Src/builtin.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Src') 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)); -- cgit 1.4.1