Commit 9d47b11b authored Nov 18, 2019 by Hewenliang Committed by Greg Kroah-Hartman Jan 04, 2020

libtraceevent: Fix memory leakage in copy_filter_type



[ Upstream commit 10992af6bf46a2048ad964985a5b77464e5563b1 ]

It is necessary to free the memory that we have allocated when error occurs.

Fixes: ef3072cd ("tools lib traceevent: Get rid of die in add_filter_type()")
Signed-off-by: Hewenliang <hewenliang4@huawei.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Link: http://lore.kernel.org/lkml/20191119014415.57210-1-hewenliang4@huawei.com


Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent c07956c4

tools/lib/traceevent/parse-filter.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1492,8 +1492,10 @@ static int copy_filter_type(struct event_filter *filter,
		if (strcmp(str, "TRUE") == 0 \|\| strcmp(str, "FALSE") == 0) {
		/* Add trivial event */
		arg = allocate_arg();
		if (arg == NULL)
		if (arg == NULL) {
		free(str);
		return -1;
		}

		arg->type = FILTER_ARG_BOOLEAN;
		if (strcmp(str, "TRUE") == 0)
		@@ -1502,8 +1504,11 @@ static int copy_filter_type(struct event_filter *filter,
		arg->boolean.value = 0;

		filter_type = add_filter_type(filter, event->id);
		if (filter_type == NULL)
		if (filter_type == NULL) {
		free(str);
		free_arg(arg);
		return -1;
		}

		filter_type->filter = arg;