diff options
author | Frank Ch. Eigler <fche@elastic.org> | 2010-02-23 20:31:00 -0500 |
---|---|---|
committer | Frank Ch. Eigler <fche@elastic.org> | 2010-02-23 20:31:00 -0500 |
commit | 30263a7389d5c2712536b74656193708bbc64d49 (patch) | |
tree | b10b72dd3db455abf95a8ab21c540069c0143860 /tapset-utrace.cxx | |
parent | d6c273473f7bea4d696c95ca48d55ca26e25ab2f (diff) | |
download | systemtap-steved-30263a7389d5c2712536b74656193708bbc64d49.tar.gz systemtap-steved-30263a7389d5c2712536b74656193708bbc64d49.tar.xz systemtap-steved-30263a7389d5c2712536b74656193708bbc64d49.zip |
PR11005: @defined($tvar) predicate, part 1
* staptree.h (defined_op): New class.
* all files: Extend all visitors as appropriate, mostly
dummy/pass-through implementation.
* parse.cxx (parse_target_symbol): New function, factored out
of parse_symbol().
(parse_define_op): New function.
* NEWS: Mention it.
* parse.h: Corresponding changes.
* tapsets.cxx (var_expanding_visitor::visit_defined_op):
Implement @defined() semantics.
(dwarf_var_expanding_visitor::visit_target_symbol): Adjust.
* tapset-utrace.c (visit_target_symbol_arg): Avoid crashes
on $argZZZ.
* tapsets.cxx (sdt_var_expanding_visitor): Ditto.
* semok/thirtysix.stp: New test.
Diffstat (limited to 'tapset-utrace.cxx')
-rw-r--r-- | tapset-utrace.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tapset-utrace.cxx b/tapset-utrace.cxx index 73f52c4d..4820ecf9 100644 --- a/tapset-utrace.cxx +++ b/tapset-utrace.cxx @@ -483,7 +483,15 @@ utrace_var_expanding_visitor::visit_target_symbol_arg (target_symbol* e) else // $argN { string argnum_s = e->base_name.substr(4,e->base_name.length()-4); - int argnum = lex_cast<int>(argnum_s); + int argnum = 0; + try + { + argnum = lex_cast<int>(argnum_s); + } + catch (const runtime_error& f) // non-integral $arg suffix: e.g. $argKKKSDF + { + throw semantic_error ("invalid syscall argument number (1-6)", e->tok); + } e->assert_no_components("utrace"); |