[git commit] hush: fix 'eval ""' handling

Denys Vlasenko vda.linux at googlemail.com
Wed Sep 28 23:44:17 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=78c9c736ab13caec3f6c1032e39200fed5580f50
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash_test/ash-misc/eval2.right   | 3 +++
 shell/ash_test/ash-misc/eval2.tests   | 4 ++++
 shell/hush.c                          | 2 +-
 shell/hush_test/hush-misc/eval2.right | 3 +++
 shell/hush_test/hush-misc/eval2.tests | 4 ++++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/shell/ash_test/ash-misc/eval2.right b/shell/ash_test/ash-misc/eval2.right
new file mode 100644
index 0000000..a7ce6cc
--- /dev/null
+++ b/shell/ash_test/ash-misc/eval2.right
@@ -0,0 +1,3 @@
+Zero:0
+Zero:0
+Zero:0
diff --git a/shell/ash_test/ash-misc/eval2.tests b/shell/ash_test/ash-misc/eval2.tests
new file mode 100755
index 0000000..6bfb87a
--- /dev/null
+++ b/shell/ash_test/ash-misc/eval2.tests
@@ -0,0 +1,4 @@
+false; eval; echo Zero:$?
+false; eval ""; echo Zero:$?
+false; eval "
+"; echo Zero:$?
diff --git a/shell/hush.c b/shell/hush.c
index 5698de6..d7d152c 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -5679,7 +5679,7 @@ static char* expand_strvec_to_string(char **argv)
 			n++;
 		}
 	}
-	overlapping_strcpy((char*)list, list[0]);
+	overlapping_strcpy((char*)list, list[0] ? list[0] : "");
 	debug_printf_expand("strvec_to_string='%s'\n", (char*)list);
 	return (char*)list;
 }
diff --git a/shell/hush_test/hush-misc/eval2.right b/shell/hush_test/hush-misc/eval2.right
new file mode 100644
index 0000000..a7ce6cc
--- /dev/null
+++ b/shell/hush_test/hush-misc/eval2.right
@@ -0,0 +1,3 @@
+Zero:0
+Zero:0
+Zero:0
diff --git a/shell/hush_test/hush-misc/eval2.tests b/shell/hush_test/hush-misc/eval2.tests
new file mode 100755
index 0000000..6bfb87a
--- /dev/null
+++ b/shell/hush_test/hush-misc/eval2.tests
@@ -0,0 +1,4 @@
+false; eval; echo Zero:$?
+false; eval ""; echo Zero:$?
+false; eval "
+"; echo Zero:$?


More information about the busybox-cvs mailing list