Kamil Dudka 01a2dc
From 12914ffb8af4f850637ee92bc2997218de6a179c Mon Sep 17 00:00:00 2001
Kamil Dudka 01a2dc
From: Peter Stephenson <pws@zsh.org>
Kamil Dudka 01a2dc
Date: Tue, 6 Oct 2015 09:28:07 +0100
Kamil Dudka 01a2dc
Subject: [PATCH] 36780: Fix crash in ksh mode with -n and $HOME.
Kamil Dudka 01a2dc
Kamil Dudka 01a2dc
If home variable is NULL ensure HOME is unset.
Kamil Dudka 01a2dc
Kamil Dudka 01a2dc
Upstream-commit: 83a175795a444e8169fcb592a110d4d15a09b907
Kamil Dudka 01a2dc
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
Kamil Dudka 01a2dc
---
Kamil Dudka 01a2dc
 Src/params.c | 13 +++++++------
Kamil Dudka 01a2dc
 1 file changed, 7 insertions(+), 6 deletions(-)
Kamil Dudka 01a2dc
Kamil Dudka 01a2dc
diff --git a/Src/params.c b/Src/params.c
Kamil Dudka 01a2dc
index de151a4..a8abb28 100644
Kamil Dudka 01a2dc
--- a/Src/params.c
Kamil Dudka 01a2dc
+++ b/Src/params.c
Kamil Dudka 01a2dc
@@ -775,17 +775,18 @@ createparamtable(void)
Kamil Dudka 01a2dc
 #endif
Kamil Dudka 01a2dc
     opts[ALLEXPORT] = oae;
Kamil Dudka 01a2dc
 
Kamil Dudka 01a2dc
+    /*
Kamil Dudka 01a2dc
+     * For native emulation we always set the variable home
Kamil Dudka 01a2dc
+     * (see setupvals()).
Kamil Dudka 01a2dc
+     */
Kamil Dudka 01a2dc
+    pm = (Param) paramtab->getnode(paramtab, "HOME");
Kamil Dudka 01a2dc
     if (EMULATION(EMULATE_ZSH))
Kamil Dudka 01a2dc
     {
Kamil Dudka 01a2dc
-	/*
Kamil Dudka 01a2dc
-	 * For native emulation we always set the variable home
Kamil Dudka 01a2dc
-	 * (see setupvals()).
Kamil Dudka 01a2dc
-	 */
Kamil Dudka 01a2dc
-	pm = (Param) paramtab->getnode(paramtab, "HOME");
Kamil Dudka 01a2dc
 	pm->node.flags &= ~PM_UNSET;
Kamil Dudka 01a2dc
 	if (!(pm->node.flags & PM_EXPORTED))
Kamil Dudka 01a2dc
 	    addenv(pm, home);
Kamil Dudka 01a2dc
-    }
Kamil Dudka 01a2dc
+    } else if (!home)
Kamil Dudka 01a2dc
+	pm->node.flags |= PM_UNSET;
Kamil Dudka 01a2dc
     pm = (Param) paramtab->getnode(paramtab, "LOGNAME");
Kamil Dudka 01a2dc
     if (!(pm->node.flags & PM_EXPORTED))
Kamil Dudka 01a2dc
 	addenv(pm, pm->u.str);
Kamil Dudka 01a2dc
-- 
Kamil Dudka 01a2dc
2.5.2
Kamil Dudka 01a2dc