patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Olivier Matz <olivier.matz@6wind.com>
To: ohilyard@iol.unh.edu
Cc: dev@dpdk.org, stable@dpdk.org, david.marchand@redhat.com
Subject: Re: [dpdk-stable] [PATCH v3] tests/cmdline: fix memory leaks
Date: Thu, 24 Jun 2021 14:07:54 +0200
Message-ID: <YNR1muhb00HVyNp0@platinum> (raw)
In-Reply-To: <20210623180645.91942-1-ohilyard@iol.unh.edu>

Hi Owen,

One small issue remain, please see below.

On Wed, Jun 23, 2021 at 02:06:45PM -0400, ohilyard@iol.unh.edu wrote:
> From: Owen Hilyard <ohilyard@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@iol.unh.edu>
> Reviewed-by: David Marchand <david.marchand@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
> 

  reply	other threads:[~2021-06-24 12:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20210616162553.350074-1-ohilyard@iol.unh.edu>
2021-06-16 18:07 ` [dpdk-stable] [PATCH] " ohilyard
2021-06-23  8:43   ` Olivier Matz
2021-06-23 18:06   ` [dpdk-stable] [PATCH v3] " ohilyard
2021-06-24 12:07     ` Olivier Matz [this message]
2021-06-24 13:24       ` David Marchand
2021-06-24 13:25     ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YNR1muhb00HVyNp0@platinum \
    --to=olivier.matz@6wind.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=ohilyard@iol.unh.edu \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git