OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Namhyung Kim 2013-12-12 16:36:04 +09:00 committed by Arnaldo Carvalho de Melo
parent 8f2f5ada71
commit 9451a2fd78
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/lib/traceevent/parse-filter.c
View File

@ -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);