From 82adb91f6eff659474007cb776ef0091c95aac1f Mon Sep 17 00:00:00 2001
From: osexp2000
Date: Mon, 25 Jun 2018 10:34:31 +0900
Subject: exec_shell: prevent ".: applet not found" error when SHELL env is not
 set.

When SHELL env is not set, it cause xstrdup(NULL) be executed, and result in weird error message ".: applet not found" instead of /bin/sh being used.
---
 lib/exec_shell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exec_shell.c b/lib/exec_shell.c
index 49b7df5bf..18798ebe4 100644
--- a/lib/exec_shell.c
+++ b/lib/exec_shell.c
@@ -33,13 +33,14 @@
 void __attribute__((__noreturn__)) exec_shell(void)
 {
 	const char *shell = getenv("SHELL");
-	char *shellc = xstrdup(shell);
+	char *shellc;
 	const char *shell_basename;
 	char *arg0;
 
 	if (!shell)
 		shell = DEFAULT_SHELL;
 
+	shellc = xstrdup(shell);
 	shell_basename = basename(shellc);
 	arg0 = xmalloc(strlen(shell_basename) + 2);
 	arg0[0] = '-';
-- 
cgit v1.2.3-55-g7522