From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933582Ab2GDFlO (ORCPT ); Wed, 4 Jul 2012 01:41:14 -0400 Received: from LGEMRELSE6Q.lge.com ([156.147.1.121]:58659 "EHLO LGEMRELSE6Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754906Ab2GDFjr (ORCPT ); Wed, 4 Jul 2012 01:39:47 -0400 X-AuditID: 9c930179-b7cceae000004195-76-4ff3d71edb3e From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , LKML , Steven Rostedt , Frederic Weisbecker , Namhyung Kim , Namhyung Kim , Arnaldo Carvalho de Melo , Borislav Petkov , David Ahern Subject: [PATCH 11/16] tools lib traceevent: Do not call add_event() again if allocation failed Date: Wed, 4 Jul 2012 14:35:25 +0900 Message-Id: <1341380130-23863-11-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1341380130-23863-1-git-send-email-namhyung@kernel.org> References: <1341380068-23806-1-git-send-email-namhyung@kernel.org> <1341380130-23863-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 From: Namhyung Kim 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 Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: David Ahern Link: http://lkml.kernel.org/r/1335157118-14658-8-git-send-email-namhyung.kim@lge.com Signed-off-by: Steven Rostedt Signed-off-by: Namhyung Kim --- tools/lib/traceevent/event-parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 337ca02fb525..99b0cd4b79d4 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; } -- 1.7.10.4