[dpdk-stable] [PATCH v3] tests/cmdline: fix memory leaks
Olivier Matz
olivier.matz at 6wind.com
Thu Jun 24 14:07:54 CEST 2021
Hi Owen,
One small issue remain, please see below.
On Wed, Jun 23, 2021 at 02:06:45PM -0400, ohilyard at iol.unh.edu wrote:
> From: Owen Hilyard <ohilyard at iol.unh.edu>
>
> Fixes for a few memory leaks in the cmdline_autotest unit test.
>
> All of the leaks were related to not freeing the commandline struct
> after testing had completed.
>
> Fixes: dbb860e03e ("cmdline: tests")
>
> Signed-off-by: Owen Hilyard <ohilyard at iol.unh.edu>
> Reviewed-by: David Marchand <david.marchand at redhat.com>
> ---
> app/test/test_cmdline_lib.c | 40 ++++++++++++++++++++++++++-----------
> 1 file changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c
> index bd72df0da..b476b2594 100644
> --- a/app/test/test_cmdline_lib.c
> +++ b/app/test/test_cmdline_lib.c
> @@ -71,10 +71,12 @@ test_cmdline_parse_fns(void)
> if (cmdline_complete(cl, "buffer", &i, NULL, sizeof(dst)) >= 0)
> goto error;
>
> + cmdline_free(cl);
> return 0;
>
> error:
> printf("Error: function accepted null parameter!\n");
> + cmdline_free(cl);
> return -1;
> }
>
> @@ -140,32 +142,44 @@ static int
> test_cmdline_socket_fns(void)
> {
> cmdline_parse_ctx_t ctx;
> + struct cmdline *cl;
>
> - if (cmdline_stdin_new(NULL, "prompt") != NULL)
> + cl = cmdline_stdin_new(NULL, "prompt");
> + if (cl != NULL)
> goto error;
> - if (cmdline_stdin_new(&ctx, NULL) != NULL)
> + cl = cmdline_stdin_new(&ctx, NULL);
> + if (cl != NULL)
> goto error;
> - if (cmdline_file_new(NULL, "prompt", "/dev/null") != NULL)
> + cl = cmdline_file_new(NULL, "prompt", "/dev/null");
> + if (cl != NULL)
> goto error;
> - if (cmdline_file_new(&ctx, NULL, "/dev/null") != NULL)
> + cl = cmdline_file_new(&ctx, NULL, "/dev/null");
> + if (cl != NULL)
> goto error;
> - if (cmdline_file_new(&ctx, "prompt", NULL) != NULL)
> + cl = cmdline_file_new(&ctx, "prompt", NULL);
> + if (cl != NULL)
> goto error;
> - if (cmdline_file_new(&ctx, "prompt", "-/invalid/~/path") != NULL) {
> + cl = cmdline_file_new(&ctx, "prompt", "-/invalid/~/path");
> + if (cl != NULL) {
> printf("Error: succeeded in opening invalid file for reading!");
> + cmdline_free(cl);
> return -1;
> }
> - if (cmdline_file_new(&ctx, "prompt", "/dev/null") == NULL) {
> + cl = cmdline_file_new(&ctx, "prompt", "/dev/null");
> + if (cl == NULL) {
> printf("Error: failed to open /dev/null for reading!");
> + cmdline_free(cl);
> return -1;
> }
The cmdline_free(cl) after a if (cl == NULL) is not needed.
After that change, you can add my ack in v4.
Thanks,
Olivier
>
> /* void functions */
> cmdline_stdin_exit(NULL);
>
> + cmdline_free(cl);
> return 0;
> error:
> printf("Error: function accepted null parameter!\n");
> + cmdline_free(cl);
> return -1;
> }
>
> @@ -176,13 +190,14 @@ test_cmdline_fns(void)
> struct cmdline *cl;
>
> memset(&ctx, 0, sizeof(ctx));
> - cl = cmdline_new(&ctx, "test", -1, -1);
> - if (cl == NULL)
> + cl = cmdline_new(NULL, "prompt", 0, 0);
> + if (cl != NULL)
> goto error;
> -
> - if (cmdline_new(NULL, "prompt", 0, 0) != NULL)
> + cl = cmdline_new(&ctx, NULL, 0, 0);
> + if (cl != NULL)
> goto error;
> - if (cmdline_new(&ctx, NULL, 0, 0) != NULL)
> + cl = cmdline_new(&ctx, "test", -1, -1);
> + if (cl == NULL)
> goto error;
> if (cmdline_in(NULL, "buffer", CMDLINE_TEST_BUFSIZE) >= 0)
> goto error;
> @@ -198,6 +213,7 @@ test_cmdline_fns(void)
> cmdline_interact(NULL);
> cmdline_quit(NULL);
>
> + cmdline_free(cl);
> return 0;
>
> error:
> --
> 2.30.2
>
More information about the stable
mailing list