From: Ingo van Lil <inguin@gmx.de>
Date: Fri, 5 Jan 2018 14:04:23 +0000 (+0100)
Subject: ash: fail if 'shift' operand is out of range
X-Git-Tag: 1_28_1~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=59675c625d6500a9a0657481321954b0d1f63da9;p=oweals%2Fbusybox.git

ash: fail if 'shift' operand is out of range

If the numeric argument passed to ash's 'shift' built-in is greater than
'$#' the command performs no operation and exits successfully. It should
return a non-zero exit code instead:

http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#shift

This is consistent with bash and hush.

function                                             old     new   delta
shiftcmd                                             122     120      -2

Signed-off-by: Ingo van Lil <inguin@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/ash.c b/shell/ash.c
index dfb7d4d8e..b73a79975 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10858,7 +10858,7 @@ shiftcmd(int argc UNUSED_PARAM, char **argv)
 	if (argv[1])
 		n = number(argv[1]);
 	if (n > shellparam.nparam)
-		n = 0; /* bash compat, was = shellparam.nparam; */
+		return 1;
 	INT_OFF;
 	shellparam.nparam -= n;
 	for (ap1 = shellparam.p; --n >= 0; ap1++) {