From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760657Ab3LIFfI (ORCPT ); Mon, 9 Dec 2013 00:35:08 -0500 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:58135 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760047Ab3LIFeR (ORCPT ); Mon, 9 Dec 2013 00:34:17 -0500 X-AuditID: 9c930197-b7bdbae000000e78-78-52a55656b1dc From: Namhyung Kim To: Arnaldo Carvalho de Melo , Steven Rostedt Cc: Frederic Weisbecker , Ingo Molnar , Jiri Olsa , LKML , Namhyung Kim Subject: [PATCH 08/14] tools lib traceevent: Get rid of die() in create_arg_item() Date: Mon, 9 Dec 2013 14:34:05 +0900 Message-Id: <1386567251-22751-9-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1386567251-22751-1-git-send-email-namhyung@kernel.org> References: <1386567251-22751-1-git-send-email-namhyung@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Namhyung Kim --- 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 faa10824b87d..5efe66a682bd 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -389,8 +389,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 */ -- 1.7.11.7