Commit 9451a2fd authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

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

Signed-off-by: default avatarNamhyung 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.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8f2f5ada
...@@ -56,7 +56,21 @@ static void show_error(char **error_str, const char *fmt, ...) ...@@ -56,7 +56,21 @@ static void show_error(char **error_str, const char *fmt, ...)
index = pevent_get_input_buf_ptr(); index = pevent_get_input_buf_ptr();
len = input ? strlen(input) : 0; 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) { if (len) {
strcpy(error, input); strcpy(error, input);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment