From ed82b7c902d6a2e26452ec51c9cdb9665dbf9e97 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 27 Apr 2009 22:35:05 -0400
Subject: PR10102: tolerate mismatched optional probe

* elaborate.cxx: Early return for mismatched optional probe.
* testsuite/systemtap.base/optionalprobe.exp: New test case.
* testsuite/systemtap.base/optionalprobe.stp: Ditto.
---
 elaborate.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'elaborate.cxx')

diff --git a/elaborate.cxx b/elaborate.cxx
index 47b77c9b..53f2a8f6 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -406,6 +406,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();
-- 
cgit