diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-04-30 11:45:09 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-04-30 11:45:09 -0400 |
| commit | b03d329d5ad9d22d684b61859971a7b12b5e5104 (patch) | |
| tree | c32105776a6c009ed96f5c1a2205849f8cda647d /elaborate.cxx | |
| parent | 4c797c5eaeb10d8d22501c5ad82766b69d8cf988 (diff) | |
| parent | 3ba2eb82cafa938c1c3f7ef9d2da06912a49d8e0 (diff) | |
| download | systemtap-steved-b03d329d5ad9d22d684b61859971a7b12b5e5104.tar.gz systemtap-steved-b03d329d5ad9d22d684b61859971a7b12b5e5104.tar.xz systemtap-steved-b03d329d5ad9d22d684b61859971a7b12b5e5104.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'elaborate.cxx')
| -rw-r--r-- | elaborate.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/elaborate.cxx b/elaborate.cxx index a1c2e652..f6e1bbbf 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -427,6 +427,9 @@ match_node::find_and_build (systemtap_session& s, sub_map_iterator_t i = sub.find (match); if (i == sub.end()) // no match { + if (loc->optional) /* PR10102: to tolerate mismatched optional probe */ + return; + string alternatives; for (sub_map_iterator_t i = sub.begin(); i != sub.end(); i++) alternatives += string(" ") + i->first.str(); |