lkml.org 
[lkml]   [2015]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 09/11] tools lib traceevent: Add alias field to struct format_field
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;


\
 
 \ /
  Last update: 2015-02-25 00:21    [W:0.165 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site