Messages in this thread Patch in this message | | | From | Namhyung Kim <> | Subject | [PATCH 09/14] tools lib traceevent: Get rid of die() in add_right() | Date | Mon, 9 Dec 2013 14:34:06 +0900 |
| |
Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- tools/lib/traceevent/parse-filter.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index 5efe66a682bd..a1ad609a860f 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -583,12 +583,18 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg, op->str.type = op_type; op->str.field = left->field.field; op->str.val = strdup(str); - if (!op->str.val) - die("malloc string"); + if (!op->str.val) { + show_error(error_str, "Failed to allocate string filter"); + return -1; + } /* * Need a buffer to copy data for tests */ - op->str.buffer = malloc_or_die(op->str.field->size + 1); + op->str.buffer = malloc(op->str.field->size + 1); + if (op->str.buffer) { + show_error(error_str, "Failed to allocate string filter"); + return -1; + } /* Null terminate this buffer */ op->str.buffer[op->str.field->size] = 0; -- 1.7.11.7
| |