From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@kernel.org>, Jiri Olsa <jolsa@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
Namhyung Kim <namhyung.kim@lge.com>
Subject: [PATCH 05/14] tools lib traceevent: Get rid of malloc_or_die() in read_token()
Date: Mon, 9 Dec 2013 14:34:02 +0900 [thread overview]
Message-ID: <1386567251-22751-6-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1386567251-22751-1-git-send-email-namhyung@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/lib/traceevent/parse-filter.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 35fac1fa376b..e9d17bfcdffd 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -109,7 +109,11 @@ static enum event_type read_token(char **tok)
(strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&
pevent_peek_char() == '~') {
/* append it */
- *tok = malloc_or_die(3);
+ *tok = malloc(3);
+ if (*tok == NULL) {
+ free_token(token);
+ return EVENT_ERROR;
+ }
sprintf(*tok, "%c%c", *token, '~');
free_token(token);
/* Now remove the '~' from the buffer */
@@ -1107,6 +1111,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,
break;
case EVENT_NONE:
break;
+ case EVENT_ERROR:
+ goto fail_alloc;
default:
goto fail_print;
}
--
1.7.11.7
next prev parent reply other threads:[~2013-12-09 5:37 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 5:33 [PATCHSET 00/14] tools lib traceevent: Get rid of *die() calls from parse-filter.c Namhyung Kim
2013-12-09 5:33 ` [PATCH 01/14] tools lib traceevent: Get rid of malloc_or_die() in show_error() Namhyung Kim
2013-12-09 18:30 ` Arnaldo Carvalho de Melo
2013-12-09 19:03 ` Steven Rostedt
2013-12-09 19:14 ` Arnaldo Carvalho de Melo
2013-12-09 19:23 ` Steven Rostedt
2013-12-10 2:03 ` Namhyung Kim
2013-12-10 2:14 ` Steven Rostedt
2013-12-10 5:01 ` Namhyung Kim
2013-12-10 5:30 ` Namhyung Kim
2013-12-11 0:40 ` Namhyung Kim
2013-12-11 1:55 ` Steven Rostedt
2013-12-11 2:29 ` Namhyung Kim
2013-12-12 1:10 ` Steven Rostedt
2013-12-09 5:33 ` [PATCH 02/14] tools lib traceevent: Get rid of die in add_filter_type() Namhyung Kim
2013-12-09 10:44 ` Jiri Olsa
2013-12-10 0:32 ` Namhyung Kim
2013-12-09 5:34 ` [PATCH 03/14] tools lib traceevent: Get rid of malloc_or_die() in pevent_filter_alloc() Namhyung Kim
2013-12-11 11:05 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-12-09 5:34 ` [PATCH 04/14] tools lib traceevent: Get rid of malloc_or_die() allocate_arg() Namhyung Kim
2013-12-09 16:05 ` Steven Rostedt
2013-12-10 1:21 ` Namhyung Kim
2013-12-10 2:08 ` Steven Rostedt
2013-12-09 5:34 ` Namhyung Kim [this message]
2013-12-09 5:34 ` [PATCH 06/14] tools lib traceevent: Get rid of malloc_or_die() in find_event() Namhyung Kim
2013-12-09 11:03 ` Jiri Olsa
2013-12-09 16:27 ` Steven Rostedt
2013-12-10 0:48 ` Namhyung Kim
2013-12-09 5:34 ` [PATCH 07/14] tools lib traceevent: Get rid of malloc_or_die() in add_event() Namhyung Kim
2013-12-11 11:06 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-12-09 5:34 ` [PATCH 08/14] tools lib traceevent: Get rid of die() in create_arg_item() Namhyung Kim
2013-12-11 11:06 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-12-09 5:34 ` [PATCH 09/14] tools lib traceevent: Get rid of die() in add_right() Namhyung Kim
2013-12-09 6:28 ` Ilia Mirkin
2013-12-09 6:59 ` Namhyung Kim
2013-12-09 16:32 ` Steven Rostedt
2013-12-09 23:47 ` Namhyung Kim
2013-12-09 5:34 ` [PATCH 10/14] tools lib traceevent: Get rid of die() in reparent_op_arg() Namhyung Kim
2013-12-09 5:34 ` [PATCH 11/14] tools lib traceevent: Get rid of malloc_or_die() in pevent_filter_add_filter_str() Namhyung Kim
2013-12-11 11:06 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-12-09 5:34 ` [PATCH 12/14] tools lib traceevent: Get rid of die() in pevent_filter_clear_trivial() Namhyung Kim
2013-12-11 11:06 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-12-09 5:34 ` [PATCH 13/14] tools lib traceevent: Refactor test_filter() to get rid of die() Namhyung Kim
2013-12-09 16:19 ` Steven Rostedt
2013-12-10 1:48 ` Namhyung Kim
2013-12-09 5:34 ` [PATCH 14/14] tools lib traceevent: Get rid of die() in some string conversion funcitons Namhyung Kim
2013-12-09 16:24 ` Steven Rostedt
2013-12-10 1:50 ` Namhyung Kim
2013-12-09 10:47 ` [PATCHSET 00/14] tools lib traceevent: Get rid of *die() calls from parse-filter.c Jiri Olsa
2013-12-09 16:40 ` Steven Rostedt
2013-12-09 16:24 ` Steven Rostedt
2013-12-09 18:41 ` Arnaldo Carvalho de Melo
2013-12-10 0:34 ` 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=1386567251-22751-6-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=rostedt@goodmis.org \
/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