From: tip-bot for Thomas Jarosch <thomas.jarosch@intra2net.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, thomas.jarosch@intra2net.com,
tglx@linutronix.de
Subject: [tip:perf/core] perf tools: Fix memory leak on error
Date: Thu, 31 Jan 2013 03:02:38 -0800 [thread overview]
Message-ID: <tip-0b9e01a4f0d1c8277da6824fe060ccb0434d2fde@git.kernel.org> (raw)
In-Reply-To: <2717013.8dV0naNhAV@storm>
Commit-ID: 0b9e01a4f0d1c8277da6824fe060ccb0434d2fde
Gitweb: http://git.kernel.org/tip/0b9e01a4f0d1c8277da6824fe060ccb0434d2fde
Author: Thomas Jarosch <thomas.jarosch@intra2net.com>
AuthorDate: Fri, 25 Jan 2013 11:20:47 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 30 Jan 2013 10:40:05 -0300
perf tools: Fix memory leak on error
cppcheck reported:
[util/event.c:480]: (error) Memory leak: event
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Link: http://lkml.kernel.org/r/2717013.8dV0naNhAV@storm
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 3cf2c3e..5cd13d7 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -476,8 +476,10 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
}
}
- if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0)
+ if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0) {
+ free(event);
return -ENOENT;
+ }
map = machine->vmlinux_maps[MAP__FUNCTION];
size = snprintf(event->mmap.filename, sizeof(event->mmap.filename),
prev parent reply other threads:[~2013-01-31 11:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 10:20 [perf PATCH 1/3] Fix memory leak on error Thomas Jarosch
2013-01-31 11:02 ` tip-bot for Thomas Jarosch [this message]
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=tip-0b9e01a4f0d1c8277da6824fe060ccb0434d2fde@git.kernel.org \
--to=thomas.jarosch@intra2net.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox