Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Message-ID: <54481503-67c6-40ec-a02a-31f4db4205f7@intel.com>
Date:   Thu, 12 Oct 2023 08:02:45 +0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] perf tools: Put the function return operation at the end
 of the function
To:     "Kunwu.Chan" <chentao@kylinos.cn>, peterz@infradead.org,
        mingo@redhat.com, acme@kernel.org, mark.rutland@arm.com,
        alexander.shishkin@linux.intel.com, jolsa@kernel.org,
        namhyung@kernel.org, irogers@google.com, kan.liang@linux.intel.com,
        seanjc@google.com, kprateek.nayak@amd.com, robert.richter@amd.com
Cc:     linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
        kunwu.chan@hotmail.com
References: <20231012031003.842368-1-chentao@kylinos.cn>
Content-Language: en-US
From:   Adrian Hunter <adrian.hunter@intel.com>
Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki,
 Business Identity Code: 0357606 - 4, Domiciled in Helsinki
In-Reply-To: <20231012031003.842368-1-chentao@kylinos.cn>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 12/10/23 06:10, Kunwu.Chan wrote:
> Function return operations should be performed after resource release.
> 
> Fixes: 4e1b9c679fcb ("perf tools: Refactor print_event_desc()")
> Signed-off-by: Kunwu.Chan <chentao@kylinos.cn>
> ---
>  tools/perf/util/header.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index d812e1e371a7..5763f21844b1 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1998,13 +1998,14 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
>  			id++;
>  		}
>  	}
> -out:
> -	free(buf);
> -	return events;
> +
>  error:
>  	free_event_desc(events);
>  	events = NULL;

Always freeing the events is wrong.  That path is only for errors.

That would show up if this had been tested.

> -	goto out;
> +
> +out:
> +	free(buf);
> +	return events;
>  }
>  
>  static int __desc_attr__fprintf(FILE *fp, const char *name, const char *val,