Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   "Kunwu.Chan" <chentao@kylinos.cn>
To:     adrian.hunter@intel.com
Cc:     acme@kernel.org, alexander.shishkin@linux.intel.com,
        chentao@kylinos.cn, irogers@google.com, jolsa@kernel.org,
        kan.liang@linux.intel.com, kprateek.nayak@amd.com,
        kunwu.chan@hotmail.com, linux-kernel@vger.kernel.org,
        linux-perf-users@vger.kernel.org, mark.rutland@arm.com,
        mingo@redhat.com, namhyung@kernel.org, peterz@infradead.org,
        robert.richter@amd.com, seanjc@google.com
Subject: [PATCH v2] perf tools: Put the function return operation at the end of the function
Date:   Thu, 12 Oct 2023 14:53:28 +0800
Message-Id: <20231012065328.878601-1-chentao@kylinos.cn>
In-Reply-To: <54481503-67c6-40ec-a02a-31f4db4205f7@intel.com>
References: <54481503-67c6-40ec-a02a-31f4db4205f7@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

All error paths go to the Release events process, while under normal
circumstances, go directly to the out process.

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..c2f23381a9c6 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;
+goto out;
 error:
 	free_event_desc(events);
 	events = NULL;
-	goto out;
+
+out:
+	free(buf);
+	return events;
 }
 
 static int __desc_attr__fprintf(FILE *fp, const char *name, const char *val,
-- 
2.25.1

Sorry, the wrong patch was sent. The correct patch should be v2 as follows.