[git commit] hush: small fix to last commit

Denys Vlasenko vda.linux at googlemail.com
Mon Jul 17 14:50:20 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=0ba80e4fa251a1c753e5feaff4b358a427aa58cb
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

die_if_script() indeed dies only in scripts! Must handle the case where it continues.

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/hush.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/hush.c b/shell/hush.c
index 836f3b8..c8356f4 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -5736,7 +5736,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
 				if (len < 0) /* bash compat */
 					die_if_script("%s: substring expression < 0", var);
 			}
-			if (len == 0 || !val || beg >= strlen(val)) {
+			if (len <= 0 || !val || beg >= strlen(val)) {
  arith_err:
 				val = NULL;
 			} else {


More information about the busybox-cvs mailing list