Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e9bb64cb-eece-f6e7-9a13-e059e2e088ae@redhat.com>
Date:   Mon, 7 Aug 2023 07:15:48 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [Libtirpc-devel] [PATCH 1/2] rpcb_clnt.c: memory leak in
 destroy_addr
Content-Language: en-US
From:   Steve Dickson <steved@redhat.com>
To:     Libtirpc-devel Mailing List <libtirpc-devel@lists.sourceforge.net>
Cc:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
References: <20230801144209.557175-1-steved@redhat.com>
In-Reply-To: <20230801144209.557175-1-steved@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 8/1/23 10:42 AM, Steve Dickson wrote:
> From: Herb Wartens <wartens2@llnl.gov>
> 
> Null pointers so they are not used again
> 
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2225226
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... (tag: libtirpc-1-3-4-rc2)

steved
> ---
>   src/rpcb_clnt.c | 20 +++++++++++++++-----
>   1 file changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c
> index d178d86..c0a9e12 100644
> --- a/src/rpcb_clnt.c
> +++ b/src/rpcb_clnt.c
> @@ -104,17 +104,27 @@ destroy_addr(addr)
>   {
>   	if (addr == NULL)
>   		return;
> -	if(addr->ac_host != NULL)
> +	if (addr->ac_host != NULL) {
>   		free(addr->ac_host);
> -	if(addr->ac_netid != NULL)
> +		addr->ac_host = NULL;
> +	}
> +	if (addr->ac_netid != NULL) {
>   		free(addr->ac_netid);
> -	if(addr->ac_uaddr != NULL)
> +		addr->ac_netid = NULL;
> +	}
> +	if (addr->ac_uaddr != NULL) {
>   		free(addr->ac_uaddr);
> -	if(addr->ac_taddr != NULL) {
> -		if(addr->ac_taddr->buf != NULL)
> +		addr->ac_uaddr = NULL;
> +	}
> +	if (addr->ac_taddr != NULL) {
> +		if(addr->ac_taddr->buf != NULL) {
>   			free(addr->ac_taddr->buf);
> +			addr->ac_taddr->buf = NULL;
> +		}
> +		addr->ac_taddr = NULL;
>   	}
>   	free(addr);
> +	addr = NULL;
>   }
>   
>   /*