From: Wei Li <liwei391@huawei.com>
To: Alexander Shishkin <alexander.shishkin@linux.intel.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>, Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, Li Bin <huawei.libin@huawei.com>,
"Xie XiuQi" <xiexiuqi@huawei.com>,
Hongbo Yao <yaohongbo@huawei.com>
Subject: [PATCH 3/4] perf util: Fix memory leak of prefix_if_not_in
Date: Thu, 21 May 2020 21:32:17 +0800 [thread overview]
Message-ID: <20200521133218.30150-4-liwei391@huawei.com> (raw)
In-Reply-To: <20200521133218.30150-1-liwei391@huawei.com>
From: Xie XiuQi <xiexiuqi@huawei.com>
Need to free "str" before return when asprintf() failed
to avoid memory leak.
Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
---
tools/perf/util/sort.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index f14cc728c358..8ed777565c82 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2811,7 +2811,7 @@ static char *prefix_if_not_in(const char *pre, char *str)
return str;
if (asprintf(&n, "%s,%s", pre, str) < 0)
- return NULL;
+ n = NULL;
free(str);
return n;
--
2.17.1
next prev parent reply other threads:[~2020-05-21 13:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 13:32 [PATCH 0/4] perf: Fix memory errors Wei Li
2020-05-21 13:32 ` [PATCH 1/4] perf metrictroup: Fix memory leak of metric_events Wei Li
2020-05-21 15:54 ` Arnaldo Carvalho de Melo
2020-05-21 16:10 ` Ian Rogers
2020-05-21 13:32 ` [PATCH 2/4] perf svghelper: Fix memory leak in svg_build_topology_map Wei Li
2020-05-21 14:15 ` Arnaldo Carvalho de Melo
2020-06-03 3:03 ` LiBin (Huawei)
2020-05-21 13:32 ` Wei Li [this message]
2020-05-21 14:39 ` [PATCH 3/4] perf util: Fix memory leak of prefix_if_not_in Arnaldo Carvalho de Melo
2020-05-21 13:32 ` [PATCH 4/4] perf util: Fix potential segment fault in put_tracepoints_path Wei Li
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=20200521133218.30150-4-liwei391@huawei.com \
--to=liwei391@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=huawei.libin@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=namhyung@kernel.org \
--cc=xiexiuqi@huawei.com \
--cc=yaohongbo@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.