Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753326AbbBXWzE (ORCPT ); Tue, 24 Feb 2015 17:55:04 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:9655 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752759AbbBXWzC (ORCPT ); Tue, 24 Feb 2015 17:55:02 -0500 Date: Tue, 24 Feb 2015 17:54:58 -0500 From: Steven Rostedt To: Jiri Olsa Cc: linux-kernel@vger.kernel.org, Wang Nan , Arnaldo Carvalho de Melo , David Ahern , Frederic Weisbecker , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Sebastian Andrzej Siewior , Tom Zanussi Subject: Re: [PATCH 09/11] tools lib traceevent: Add alias field to struct format_field Message-ID: <20150224225458.GB3042@home.goodmis.org> References: <1424470628-5969-1-git-send-email-jolsa@kernel.org> <1424470628-5969-10-git-send-email-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424470628-5969-10-git-send-email-jolsa@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1516 Lines: 46 On Fri, Feb 20, 2015 at 11:17:06PM +0100, Jiri Olsa wrote: > --- > tools/lib/traceevent/event-parse.c | 1 + > tools/lib/traceevent/event-parse.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c > index afe20ed9fac8..b35664cc1edc 100644 > --- a/tools/lib/traceevent/event-parse.c > +++ b/tools/lib/traceevent/event-parse.c > @@ -6236,6 +6236,7 @@ static void free_format_fields(struct format_field *field) > next = field->next; > free(field->type); > free(field->name); > + free(field->alias); Hmm, didn't we say that if there's no need for the alias that the alias will simply be a pointer to name? If that's the case we need: if (field->alias != field->name) free(field->alias); free(field->name); Otherwise it will be a double free. -- Steve > free(field); > field = next; > } > diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h > index 5b4efc062320..8490a4afffa2 100644 > --- a/tools/lib/traceevent/event-parse.h > +++ b/tools/lib/traceevent/event-parse.h > @@ -187,6 +187,7 @@ struct format_field { > struct event_format *event; > char *type; > char *name; > + char *alias; > int offset; > int size; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/