|
 |
560f4e |
From 08e287503fb4a8657962917891f2b7b90b713678 Mon Sep 17 00:00:00 2001
|
|
|
560f4e |
From: Peter Stephenson <pws@zsh.org>
|
|
|
560f4e |
Date: Tue, 13 Jun 2017 15:41:00 +0100
|
|
|
560f4e |
Subject: [PATCH] 41284: Fix NULL dereference in cd.
|
|
|
560f4e |
|
|
|
560f4e |
This happened in sh compatiblity mode if HOME was not set
|
|
|
560f4e |
and cd was used with no argument.
|
|
|
560f4e |
|
|
|
560f4e |
Upstream-commit: eb783754bdb74377f3cea4ceca9c23a02ea1bf58
|
|
|
560f4e |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
560f4e |
---
|
|
|
560f4e |
Src/builtin.c | 11 ++++++++++-
|
|
|
560f4e |
Test/B01cd.ztst | 4 ++++
|
|
|
560f4e |
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
560f4e |
|
|
|
560f4e |
diff --git a/Src/builtin.c b/Src/builtin.c
|
|
|
560f4e |
index ccfa745..caa4b64 100644
|
|
|
560f4e |
--- a/Src/builtin.c
|
|
|
560f4e |
+++ b/Src/builtin.c
|
|
|
560f4e |
@@ -842,8 +842,13 @@ cd_get_dest(char *nam, char **argv, int hard, int func)
|
|
|
560f4e |
dir = nextnode(firstnode(dirstack));
|
|
|
560f4e |
if (dir)
|
|
|
560f4e |
zinsertlinknode(dirstack, dir, getlinknode(dirstack));
|
|
|
560f4e |
- else if (func != BIN_POPD)
|
|
|
560f4e |
+ else if (func != BIN_POPD) {
|
|
|
560f4e |
+ if (!home) {
|
|
|
560f4e |
+ zwarnnam(nam, "HOME not set");
|
|
|
560f4e |
+ return NULL;
|
|
|
560f4e |
+ }
|
|
|
560f4e |
zpushnode(dirstack, ztrdup(home));
|
|
|
560f4e |
+ }
|
|
|
560f4e |
} else if (!argv[1]) {
|
|
|
560f4e |
int dd;
|
|
|
560f4e |
char *end;
|
|
|
560f4e |
@@ -898,6 +903,10 @@ cd_get_dest(char *nam, char **argv, int hard, int func)
|
|
|
560f4e |
if (!dir) {
|
|
|
560f4e |
dir = firstnode(dirstack);
|
|
|
560f4e |
}
|
|
|
560f4e |
+ if (!dir || !getdata(dir)) {
|
|
|
560f4e |
+ DPUTS(1, "Directory not set, not detected early enough");
|
|
|
560f4e |
+ return NULL;
|
|
|
560f4e |
+ }
|
|
|
560f4e |
if (!(dest = cd_do_chdir(nam, getdata(dir), hard))) {
|
|
|
560f4e |
if (!target)
|
|
|
560f4e |
zsfree(getlinknode(dirstack));
|
|
|
560f4e |
diff --git a/Test/B01cd.ztst b/Test/B01cd.ztst
|
|
|
560f4e |
index c7920dd..e56fd26 100644
|
|
|
560f4e |
--- a/Test/B01cd.ztst
|
|
|
560f4e |
+++ b/Test/B01cd.ztst
|
|
|
560f4e |
@@ -125,6 +125,10 @@ F:something is broken. But you already knew that.
|
|
|
560f4e |
0:
|
|
|
560f4e |
?(eval):cd:3: not a directory: link_to_nonexistent
|
|
|
560f4e |
|
|
|
560f4e |
+ (unset HOME; ARGV0=sh $ZTST_testdir/../Src/zsh -c cd)
|
|
|
560f4e |
+1:Implicit cd with unset HOME.
|
|
|
560f4e |
+?zsh:cd:1: HOME not set
|
|
|
560f4e |
+
|
|
|
560f4e |
%clean
|
|
|
560f4e |
# This optional section cleans up after the test, if necessary,
|
|
|
560f4e |
# e.g. killing processes etc. This is in addition to the removal of *.tmp
|
|
|
560f4e |
--
|
|
|
560f4e |
2.14.3
|
|
|
560f4e |
|