emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ingo van Lil 2018-01-05 15:04:23 +01:00 committed by Denys Vlasenko
parent 6f4a785bd1
commit 9c8e94bc0a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/ash.c
View File

@ -10858,7 +10858,7 @@ shiftcmd(int argc UNUSED_PARAM, char **argv)
if (argv[1]) if (argv[1])
n = number(argv[1]); n = number(argv[1]);
if (n > shellparam.nparam) if (n > shellparam.nparam)
n = 0; /* bash compat, was = shellparam.nparam; */ return 1;
INT_OFF; INT_OFF;
shellparam.nparam -= n; shellparam.nparam -= n;
for (ap1 = shellparam.p; --n >= 0; ap1++) { for (ap1 = shellparam.p; --n >= 0; ap1++) {