diff options
| author | Denys Vlasenko | 2024-02-25 17:50:43 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2024-02-25 17:53:25 +0100 |
| commit | 758b21402abc7015cfc54eb21a2e7eead1ecf6ba (patch) | |
| tree | dce318909aa47fa4abbb3d9f68fbc64b0c9cd795 /shell/hush.c | |
| parent | 2639f3bc72ac2f03af7ccc825429ccb2fce99a16 (diff) | |
| download | busybox-758b21402abc7015cfc54eb21a2e7eead1ecf6ba.zip busybox-758b21402abc7015cfc54eb21a2e7eead1ecf6ba.tar.gz | |
hush: detect when terminating "done"/"fi" is missing
function old new delta
parse_stream 2271 2292 +21
.rodata 105408 105427 +19
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 40/0) Total: 40 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
| -rw-r--r-- | shell/hush.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c index 0c91008..3e6a13b 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -5497,6 +5497,15 @@ static struct pipe *parse_stream(char **pstring, } o_free_and_set_NULL(&ctx.word); done_pipe(&ctx, PIPE_SEQ); + + /* Do we sit inside of any if's, loops or case's? */ + if (HAS_KEYWORDS + IF_HAS_KEYWORDS(&& (ctx.ctx_res_w != RES_NONE || ctx.old_flag != 0)) + ) { + syntax_error_unterm_str("compound statement"); + goto parse_error_exitcode1; + } + pi = ctx.list_head; /* If we got nothing... */ /* (this makes bare "&" cmd a no-op. @@ -5519,7 +5528,7 @@ static struct pipe *parse_stream(char **pstring, // *heredoc_cnt_ptr = heredoc_cnt; debug_leave(); debug_printf_heredoc("parse_stream return heredoc_cnt:%d\n", heredoc_cnt); - debug_printf_parse("parse_stream return %p\n", pi); + debug_printf_parse("parse_stream return %p: EOF\n", pi); return pi; } |