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

shells: do not allow bare "read" in non-bash compat configs

Browse Source 
On Sat, Feb 9, 2019 Cristian Ionescu-Idbohrn wrote:
    > In my case (at work), I have to watch and prevent people from doing
    > unportable things.  For me, that's a burden.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2021-06-06 12:07:11 +02:00
parent a1b0d3856d
commit 457825f77a
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
shell/hush.c
View File

@ -4251,7 +4251,7 @@ static int done_word(struct parse_context *ctx)
|| endofname(command->argv[0])[0] != '\0'
) {
/* bash says just "not a valid identifier" */
syntax_error("not a valid identifier in for");
syntax_error("bad variable name in for");
return 1;
}
/* Force FOR to have just one word (variable name) */
@ -10799,10 +10799,17 @@ static int FAST_FUNC builtin_read(char **argv)
*/
params.read_flags = getopt32(argv,
# if BASH_READ_D
"!srn:p:t:u:d:", &params.opt_n, &params.opt_p, &params.opt_t, &params.opt_u, &params.opt_d
IF_NOT_HUSH_BASH_COMPAT("^")
"!srn:p:t:u:d:" IF_NOT_HUSH_BASH_COMPAT("\0" "-1"/*min 1 arg*/),
&params.opt_n, &params.opt_p, &params.opt_t, &params.opt_u, &params.opt_d
# else
"!srn:p:t:u:", &params.opt_n, &params.opt_p, &params.opt_t, &params.opt_u
IF_NOT_HUSH_BASH_COMPAT("^")
"!srn:p:t:u:" IF_NOT_HUSH_BASH_COMPAT("\0" "-1"/*min 1 arg*/),
&params.opt_n, &params.opt_p, &params.opt_t, &params.opt_u
# endif
//TODO: print "read: need variable name"
//for the case of !BASH "read" with no args (now it fails silently)
//(or maybe extend getopt32() to emit a message if "-1" fails)
);
if ((uint32_t)params.read_flags == (uint32_t)-1)
return EXIT_FAILURE;