From def93c4031b683b5b8caf85b7aedb13f7272bb97 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Fri, 27 Nov 2015 10:12:02 +0800 Subject: common: cli_hush: avoid memory leak Need to free memory avoid memory leak, when error. Signed-off-by: Peng Fan Reviewed-by: Simon Glass Cc: Simon Glass Cc: Tom Rini (cherry picked from commit c6bb23c819b5dcbc5c3491673f5e408c0b9c38b3) --- common/cli_hush.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'common/cli_hush.c') diff --git a/common/cli_hush.c b/common/cli_hush.c index 5d78463..5be7b0f 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -2470,11 +2470,16 @@ static int done_word(o_string *dest, struct p_context *ctx) } argc = ++child->argc; child->argv = realloc(child->argv, (argc+1)*sizeof(*child->argv)); - if (child->argv == NULL) return 1; + if (child->argv == NULL) { + free(str); + return 1; + } child->argv_nonnull = realloc(child->argv_nonnull, (argc+1)*sizeof(*child->argv_nonnull)); - if (child->argv_nonnull == NULL) + if (child->argv_nonnull == NULL) { + free(str); return 1; + } child->argv[argc-1]=str; child->argv_nonnull[argc-1] = dest->nonnull; child->argv[argc]=NULL; -- cgit v1.1