* conditional-probe SEGV fix

2007-11-26  Frank Ch. Eigler  <fche@elastic.org>

	* elaborate.cxx (derived_probe ctor): Don't duplicate condition
	if it doesn't exist.

diff --git a/ChangeLog b/ChangeLog
index 83e567864d6eef06e72b39ce39304a2337e34aec..c3ce7926c460a1c71bf48d0dc1cb8129f0f49231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-26  Frank Ch. Eigler  <fche@elastic.org>
+
+       * elaborate.cxx (derived_probe ctor): Don't duplicate condition
+       if it doesn't exist.
+
 2007-11-20  Masami Hiramatsu  <mhiramat@redhat.com>
 
        PR 4935.

diff --git a/elaborate.cxx b/elaborate.cxx
index d3bbe28da3b0a391816aebf6e8a77e30d7dd5f9b..c277d8d5c93d167e989de7d34da43d52a4546669 100644 (file)
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -53,7 +53,8 @@ derived_probe::derived_probe (probe *p, probe_point *l):
 {
   if (p)
     {
-      this->condition = deep_copy_visitor::deep_copy(p->condition);
+      if (p->condition) 
+        this->condition = deep_copy_visitor::deep_copy(p->condition);
       this->tok = p->tok;
       this->privileged = p->privileged;
       this->body = deep_copy_visitor::deep_copy(p->body);