[PATCH v2] perf tools: Put the function return operation at the end of the function

Kunwu.Chan posted 1 patch 2 years, 2 months ago
tools/perf/util/header.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
[PATCH v2] perf tools: Put the function return operation at the end of the function
Posted by Kunwu.Chan 2 years, 2 months ago
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.