public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
	mingo@kernel.org, namhyung.kim@lge.com, namhyung@kernel.org,
	jolsa@redhat.com, fweisbec@gmail.com, rostedt@goodmis.org,
	tglx@linutronix.de
Subject: [tip:perf/core] tools lib traceevent: Get rid of die() in create_arg_item()
Date: Wed, 11 Dec 2013 03:06:15 -0800	[thread overview]
Message-ID: <tip-2036fcd1c7ce455424c11bdb1c8a2ac906430e2f@git.kernel.org> (raw)
In-Reply-To: <1386567251-22751-9-git-send-email-namhyung@kernel.org>

Commit-ID:  2036fcd1c7ce455424c11bdb1c8a2ac906430e2f
Gitweb:     http://git.kernel.org/tip/2036fcd1c7ce455424c11bdb1c8a2ac906430e2f
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Mon, 9 Dec 2013 14:34:05 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 9 Dec 2013 15:39:46 -0300

tools lib traceevent: Get rid of die() in create_arg_item()

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386567251-22751-9-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/parse-filter.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 2b73abf..53e48eb 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -362,8 +362,11 @@ create_arg_item(struct event_format *event, const char *token,
 		arg->value.type =
 			type == EVENT_DQUOTE ? FILTER_STRING : FILTER_CHAR;
 		arg->value.str = strdup(token);
-		if (!arg->value.str)
-			die("malloc string");
+		if (!arg->value.str) {
+			free_arg(arg);
+			show_error(error_str, "failed to allocate string filter arg");
+			return NULL;
+		}
 		break;
 	case EVENT_ITEM:
 		/* if it is a number, then convert it */

  reply	other threads:[~2013-12-11 11:06 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 ` [PATCH 05/14] tools lib traceevent: Get rid of malloc_or_die() in read_token() Namhyung Kim
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-bot for Namhyung Kim [this message]
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=tip-2036fcd1c7ce455424c11bdb1c8a2ac906430e2f@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung.kim@lge.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