projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f2f5ad
)
tools lib traceevent: Get rid of malloc_or_die() in show_error()
author
Namhyung Kim
<namhyung@kernel.org>
Thu, 12 Dec 2013 07:36:04 +0000
(16:36 +0900)
committer
Arnaldo Carvalho de Melo
<acme@redhat.com>
Fri, 13 Dec 2013 13:30:21 +0000
(10:30 -0300)
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>
tools/lib/traceevent/parse-filter.c
patch
|
blob
|
history
diff --git
a/tools/lib/traceevent/parse-filter.c
b/tools/lib/traceevent/parse-filter.c
index
ab402fb
..
d4b0bac
100644
(file)
--- a/
tools/lib/traceevent/parse-filter.c
+++ b/
tools/lib/traceevent/parse-filter.c
@@
-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);