[PATCH 1/1] hush: avoid NULL check before free()

[PATCH 1/1] hush: avoid NULL check before free()

[Heinrich Schuchardt]

free() checks if its argument is NULL. Don't duplicate this in the calling
code.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 common/cli_hush.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/cli_hush.c b/common/cli_hush.c
index cf1e273485..a62af07cc5 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -1849,8 +1849,7 @@ static int run_list_real(struct pipe *pi)
 				continue;
 			} else {
 				/* insert new value from list for variable */
-				if (pi->progs->argv[0])
-					free(pi->progs->argv[0]);
+				free(pi->progs->argv[0]);
 				pi->progs->argv[0] = *list++;
 #ifndef __U_BOOT__
 				pi->progs->glob_result.gl_pathv[0] =
--
2.26.2

[PATCH 1/1] hush: avoid NULL check before free()

[Simon Glass]

On Tue, 28 Apr 2020 at 13:56, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> free() checks if its argument is NULL. Don't duplicate this in the calling
> code.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  common/cli_hush.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

[PATCH 1/1] hush: avoid NULL check before free()

[Tom Rini]

On Tue, Apr 28, 2020 at 09:56:10PM +0200, Heinrich Schuchardt wrote:

> free() checks if its argument is NULL. Don't duplicate this in the calling
> code.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200501/e00be0ba/attachment.sig>