From: tip-bot for Namhyung Kim <namhyung.kim@lge.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
namhyung.kim@lge.com, namhyung@kernel.org, bp@alien8.de,
namhyung@gmail.com, fweisbec@gmail.com, rostedt@goodmis.org,
acme@infradead.org, dsahern@gmail.com, tglx@linutronix.de
Subject: [tip:perf/core] tools lib traceevent: Do not call add_event() again if allocation failed
Date: Fri, 6 Jul 2012 04:17:19 -0700 [thread overview]
Message-ID: <tip-4b5632bc3122ec9b7e875294c8abe92f1573196a@git.kernel.org> (raw)
In-Reply-To: <1335157118-14658-8-git-send-email-namhyung.kim@lge.com>
Commit-ID: 4b5632bc3122ec9b7e875294c8abe92f1573196a
Gitweb: http://git.kernel.org/tip/4b5632bc3122ec9b7e875294c8abe92f1573196a
Author: Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Mon, 23 Apr 2012 13:58:34 +0900
Committer: Namhyung Kim <namhyung@kernel.org>
CommitDate: Wed, 4 Jul 2012 13:40:31 +0900
tools lib traceevent: Do not call add_event() again if allocation failed
When memory allocation for the field name is failed, do not goto
event_failed since we added the event already.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/r/1335157118-14658-8-git-send-email-namhyung.kim@lge.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/lib/traceevent/event-parse.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 337ca02..99b0cd4 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4770,7 +4770,8 @@ int pevent_parse_event(struct pevent *pevent,
arg->field.name = strdup(field->name);
if (!arg->field.name) {
do_warning("failed to allocate field name");
- goto event_failed;
+ event->flags |= EVENT_FL_FAILED;
+ return -1;
}
arg->field.field = field;
}
next prev parent reply other threads:[~2012-07-06 11:17 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 4:58 [PATCH 00/11] trace-cmd: libparsevent cleanups - part 2 Namhyung Kim
2012-04-23 4:58 ` [PATCH 01/11] parse-events: Free flag/sym field on failure path Namhyung Kim
2012-04-23 16:21 ` Steven Rostedt
2012-04-24 0:05 ` Namhyung Kim
2012-04-24 1:07 ` [PATCH v2] " Namhyung Kim
2012-04-23 4:58 ` [PATCH 02/11] parse-events: Fix freeing arg on process_dynamic_array() Namhyung Kim
2012-04-23 16:34 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 03/11] parse-events: Get rid of handling concatenation on event_read_print Namhyung Kim
2012-04-23 16:33 ` Steven Rostedt
2012-04-24 0:09 ` Namhyung Kim
2012-04-24 0:26 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 04/11] parse-events: Remove unused arg->dynarray.index Namhyung Kim
2012-04-23 18:35 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 05/11] parse-events: Use proper function parameter type Namhyung Kim
2012-04-23 18:38 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 06/11] parse-events: Pass string type argument to args Namhyung Kim
2012-04-23 18:41 ` Steven Rostedt
2012-07-06 11:16 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 07/11] parse-events: Do not call add_event() again if allocation failed Namhyung Kim
2012-04-23 18:43 ` Steven Rostedt
2012-07-06 11:17 ` tip-bot for Namhyung Kim [this message]
2012-04-23 4:58 ` [PATCH 08/11] parse-events: Fix some comments Namhyung Kim
2012-04-23 18:47 ` Steven Rostedt
2012-07-06 11:18 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 09/11] parse-filter: Check result of malloc() during reading token Namhyung Kim
2012-04-23 18:48 ` Steven Rostedt
2012-04-24 0:15 ` Namhyung Kim
2012-07-06 11:19 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 10/11] parse-filter: Fix signature of create_arg_item() Namhyung Kim
2012-04-23 18:57 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 11/11] parse-filter: Check return value of arg_to_str() Namhyung Kim
2012-04-23 18:59 ` Steven Rostedt
2012-07-06 11:20 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-24 1:29 ` [PATCH 12/11] parse-events: Cleanup realloc use Namhyung Kim
2012-05-15 8:39 ` Namhyung Kim
2012-05-15 8:48 ` Steven Rostedt
2012-05-15 9:32 ` Namhyung Kim
2012-07-06 11:21 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
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-4b5632bc3122ec9b7e875294c8abe92f1573196a@git.kernel.org \
--to=namhyung.kim@lge.com \
--cc=acme@infradead.org \
--cc=bp@alien8.de \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@gmail.com \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.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