* [PATCH] hush: bail out of scripts on syntax error
@ 2012-05-02 7:12 Sascha Hauer
2012-05-02 7:36 ` Uwe Kleine-König
0 siblings, 1 reply; 2+ messages in thread
From: Sascha Hauer @ 2012-05-02 7:12 UTC (permalink / raw)
To: barebox; +Cc: ukl
On a systax error we have to bail out of the shell instead of
setting inp->p to NULL and crash barebox with a NULL pointer
deref. This only happened in scripts.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/hush.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/hush.c b/common/hush.c
index 053d9a5..f432c0c 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1436,6 +1436,7 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
rcode = parse_stream(&temp, ctx, inp, '\n');
if (rcode != 1 && ctx->old_flag != 0) {
syntax();
+ return 1;
}
if (rcode != 1 && ctx->old_flag == 0) {
done_word(&temp, ctx);
@@ -1460,8 +1461,9 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
inp->__promptme = 1;
temp.nonnull = 0;
temp.quote = 0;
- inp->p = NULL;
free_pipe_list(ctx->list_head,0);
+ b_free(&temp);
+ return 1;
}
b_free(&temp);
} while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */
--
1.7.10
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-02 7:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-02 7:12 [PATCH] hush: bail out of scripts on syntax error Sascha Hauer
2012-05-02 7:36 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox