Commit 9451a2fd authored Dec 12, 2013 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Dec 13, 2013

tools lib traceevent: Get rid of malloc_or_die() in show_error()



Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386833777-3790-2-git-send-email-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 8f2f5ada

tools/lib/traceevent/parse-filter.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,21 @@ static void show_error(char *error_str, const char fmt, ...)
		index = pevent_get_input_buf_ptr();
		len = input ? strlen(input) : 0;

		error = malloc_or_die(MAX_ERR_STR_SIZE + (len*2) + 3);
		error = malloc(MAX_ERR_STR_SIZE + (len*2) + 3);
		if (error == NULL) {
		/*
		* Maybe it's due to len is too long.
		* Retry without the input buffer part.
		*/
		len = 0;

		error = malloc(MAX_ERR_STR_SIZE);
		if (error == NULL) {
		/* no memory */
		*error_str = NULL;
		return;
		}
		}

		if (len) {
		strcpy(error, input);