lkml.org 
[lkml]   [2013]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 01/14] tools lib traceevent: Get rid of malloc_or_die() in show_error()
Date
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/lib/traceevent/parse-filter.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index ab402fb2dcf7..d4b0bac80dc8 100644
--- 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);
--
1.7.11.7


\
 
 \ /
  Last update: 2013-12-12 09:01    [W:0.167 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site