netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Phil Sutter <phil@nwl.cc>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [nft PATCH] cli: Make valgrind happy
Date: Tue, 20 Jun 2023 18:04:33 +0200	[thread overview]
Message-ID: <ZJHOEff+hNaj6g8e@calendula> (raw)
In-Reply-To: <20230620140352.21633-1-phil@nwl.cc>

On Tue, Jun 20, 2023 at 04:03:52PM +0200, Phil Sutter wrote:
> Missing call to nft_ctx_free() upsets valgrind enough to suspect
> possible losses, add them where sensible. This fixes reports with
> readline-lined builds at least. The same code is shared for libedit
> though, and there's an obvious spot for linenoise.

Maybe call nft_ctx_free() from cli_exit() ?

> Signed-off-by: Phil Sutter <phil@nwl.cc>
> ---
>  src/cli.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/cli.c b/src/cli.c
> index 11fc85abeaa2b..bc7f64ef0b762 100644
> --- a/src/cli.c
> +++ b/src/cli.c
> @@ -126,6 +126,7 @@ static void cli_complete(char *line)
>  	if (line == NULL) {
>  		printf("\n");
>  		cli_exit();
> +		nft_ctx_free(cli_nft);
>  		exit(0);
>  	}
>  
> @@ -141,6 +142,7 @@ static void cli_complete(char *line)
>  
>  	if (!strcmp(line, CMDLINE_QUIT)) {
>  		cli_exit();
> +		nft_ctx_free(cli_nft);
>  		exit(0);
>  	}
>  
> @@ -244,6 +246,7 @@ int cli_init(struct nft_ctx *nft)
>  		linenoiseFree(line);
>  	}
>  	cli_exit();
> +	nft_ctx_free(nft);
>  	exit(0);
>  }
>  
> -- 
> 2.40.0
> 

  reply	other threads:[~2023-06-20 16:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-20 14:03 [nft PATCH] cli: Make valgrind happy Phil Sutter
2023-06-20 16:04 ` Pablo Neira Ayuso [this message]
2023-06-21 12:12   ` Phil Sutter
2023-06-21 14:49     ` Pablo Neira Ayuso

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=ZJHOEff+hNaj6g8e@calendula \
    --to=pablo@netfilter.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=phil@nwl.cc \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).