lkml.org 
[lkml]   [2011]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/4] trace-cmd: Handle opcode parsing error
Date
If an invalid opcode is encountered in parsing event print format, the
trace-cmd calls exit() without parsing any other events.

This patch adds handling for such an error where the get_op_prio() is
called. If the return value is -1, then the event print format parsing
is skipped and parsing continues.

Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
---
parse-events.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/parse-events.c b/parse-events.c
index 58ffe51..c62ca5a 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -1588,7 +1588,7 @@ static int get_op_prio(char *op)
case '?':
return 16;
default:
- die("unknown op '%c'", op[0]);
+ do_warning("unknown op '%c'", op[0]);
return -1;
}
} else {
@@ -1609,22 +1609,22 @@ static int get_op_prio(char *op)
} else if (strcmp(op, "||") == 0) {
return 15;
} else {
- die("unknown op '%s'", op);
+ do_warning("unknown op '%s'", op);
return -1;
}
}
}

-static void set_op_prio(struct print_arg *arg)
+static int set_op_prio(struct print_arg *arg)
{

/* single ops are the greatest */
- if (!arg->op.left || arg->op.left->type == PRINT_NULL) {
+ if (!arg->op.left || arg->op.left->type == PRINT_NULL)
arg->op.prio = 0;
- return;
- }
+ else
+ arg->op.prio = get_op_prio(arg->op.op);

- arg->op.prio = get_op_prio(arg->op.op);
+ return arg->op.prio;
}

/* Note, *tok does not get freed, but will most likely be saved */
@@ -1706,7 +1706,10 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
arg->op.op = token;
arg->op.left = left;

- set_op_prio(arg);
+ if (set_op_prio(arg) == -1) {
+ event->flags |= EVENT_FL_FAILED;
+ goto out_free;
+ }

type = read_token_item(&token);
*tok = token;
--
1.7.3.1


\
 
 \ /
  Last update: 2011-07-25 20:43    [W:0.125 / U:0.720 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site