[PATCH] hush: Add missing initialize_context() in some places

Sascha Hauer s.hauer at pengutronix.de
Wed Nov 4 22:59:38 PST 2015


Before a context can be used it must be initialized. This was forgotten
in several places. Add the missing calls to initialize_context().
This fixes crashes when sourcing empty files

Reported-by: Wjatscheslaw Stoljarski <wjatscheslaw.stoljarski at kiwigrid.com>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---

This patch should fix this issue.

 common/hush.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hush.c b/common/hush.c
index abe8713..084dd85 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -814,6 +814,8 @@ static int run_pipe_real(struct p_context *ctx, struct pipe *pi)
 		char * str = NULL;
 		struct p_context ctx1;
 
+		initialize_context(&ctx1);
+
 		str = make_string((child->argv + i));
 		rcode = parse_string_outer(&ctx1, str, FLAG_EXIT_FROM_LOOP | FLAG_REPARSING);
 		release_context(&ctx1);
@@ -1866,6 +1868,8 @@ int run_command(const char *cmd)
 	struct p_context ctx;
 	int ret;
 
+	initialize_context(&ctx);
+
 	ret = parse_string_outer(&ctx, cmd, FLAG_PARSE_SEMICOLON);
 	release_context(&ctx);
 
@@ -1889,6 +1893,8 @@ static int source_script(const char *path, int argc, char *argv[])
 	char *script;
 	int ret;
 
+	initialize_context(&ctx);
+
 	ctx.global_argc = argc;
 	ctx.global_argv = argv;
 
-- 
2.6.1




More information about the barebox mailing list