Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8c49d26 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Free field if an error occurs on process_fields 



The field should be freed on error paths.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1348037924-17568-4-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 41e51a28

tools/lib/traceevent/event-parse.c

+7 −5
Original line number Diff line number Diff line
@@ -2186,10 +2186,10 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char ** 


		value = arg_eval(arg);

		if (value == NULL)

			goto out_free;

			goto out_free_field;

		field->value = strdup(value);

		if (field->value == NULL)

			goto out_free;

			goto out_free_field;



		free_arg(arg);

		arg = alloc_arg();
@@ -2197,14 +2197,14 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char ** 
		free_token(token);

		type = process_arg(event, arg, &token);

		if (test_type_token(type, token, EVENT_OP, "}"))

			goto out_free;

			goto out_free_field;



		value = arg_eval(arg);

		if (value == NULL)

			goto out_free;

			goto out_free_field;

		field->str = strdup(value);

		if (field->str == NULL)

			goto out_free;

			goto out_free_field;

		free_arg(arg);

		arg = NULL;
@@ -2218,6 +2218,8 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char ** 
	*tok = token;

	return type;



out_free_field:

	free_flag_sym(field);

out_free:

	free_arg(arg);

	free_token(token);