|
@@ -1387,7 +1387,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
|
|
do_warning_event(event, "%s: no type found", __func__);
|
|
do_warning_event(event, "%s: no type found", __func__);
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
- field->name = last_token;
|
|
|
|
|
|
+ field->name = field->alias = last_token;
|
|
|
|
|
|
if (test_type(type, EVENT_OP))
|
|
if (test_type(type, EVENT_OP))
|
|
goto fail;
|
|
goto fail;
|
|
@@ -1469,7 +1469,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
|
|
size_dynamic = type_size(field->name);
|
|
size_dynamic = type_size(field->name);
|
|
free_token(field->name);
|
|
free_token(field->name);
|
|
strcat(field->type, brackets);
|
|
strcat(field->type, brackets);
|
|
- field->name = token;
|
|
|
|
|
|
+ field->name = field->alias = token;
|
|
type = read_token(&token);
|
|
type = read_token(&token);
|
|
} else {
|
|
} else {
|
|
char *new_type;
|
|
char *new_type;
|
|
@@ -6444,6 +6444,8 @@ void pevent_ref(struct pevent *pevent)
|
|
void pevent_free_format_field(struct format_field *field)
|
|
void pevent_free_format_field(struct format_field *field)
|
|
{
|
|
{
|
|
free(field->type);
|
|
free(field->type);
|
|
|
|
+ if (field->alias != field->name)
|
|
|
|
+ free(field->alias);
|
|
free(field->name);
|
|
free(field->name);
|
|
free(field);
|
|
free(field);
|
|
}
|
|
}
|