[icinga-checkins] icinga.org: icinga-core/cmaser/fixes: fix segfault in escalation conditions when using object tricks ( Vitali Voroth)

git at icinga.org git at icinga.org
Fri Sep 3 11:28:53 CEST 2010


Module: icinga-core
Branch: cmaser/fixes
Commit: 1a4ef2639ce5b0d641485e63c7fe2362137075f9
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=1a4ef2639ce5b0d641485e63c7fe2362137075f9

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Aug 27 18:45:08 2010 +0200

fix segfault in escalation conditions when using object tricks (Vitali Voroth)

refs #751

---

 Changelog           |    1 +
 xdata/xodtemplate.c |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index 3bf9f7b..f90c993 100644
--- a/Changelog
+++ b/Changelog
@@ -16,6 +16,7 @@ ENHANCEMENTS
 
 FIXES
 * core: fix send comments to the broker with proper expiration_time (Matthieu Kermagoret)
+* core: fix segfault in escalation conditions when using object tricks (Vitali Voroth)
 
 * classic ui: update jquery for multiple cmds dropdown, resolve conflicts with pnp
 
diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c
index 15626af..fc91ea7 100644
--- a/xdata/xodtemplate.c
+++ b/xdata/xodtemplate.c
@@ -5479,6 +5479,7 @@ int xodtemplate_duplicate_hostescalation(xodtemplate_hostescalation *temp_hostes
                         return ERROR;
                 
                 /* string defaults */
+		new_escalationcondition->next=NULL;
                 new_escalationcondition->host_name=NULL;
                 new_escalationcondition->service_description=NULL;
                 
@@ -5502,6 +5503,7 @@ int xodtemplate_duplicate_hostescalation(xodtemplate_hostescalation *temp_hostes
                 new_escalationcondition->escalate_on_unknown=temp_escalationcondition->escalate_on_unknown;
                 new_escalationcondition->escalate_on_unreachable=temp_escalationcondition->escalate_on_unreachable;
                 new_escalationcondition->escalate_on_warning=temp_escalationcondition->escalate_on_warning;
+		new_escalationcondition->connector=temp_escalationcondition->connector;
                 
                 /* first escalation condition is head of the condition list */
                 if(new_hostescalation->condition==NULL){
@@ -5632,6 +5634,7 @@ int xodtemplate_duplicate_serviceescalation(xodtemplate_serviceescalation *temp_
                         return ERROR;
  
                 /* string defaults */
+		new_escalationcondition->next=NULL;
                 new_escalationcondition->host_name=NULL;
                 new_escalationcondition->service_description=NULL;
  
@@ -5655,6 +5658,7 @@ int xodtemplate_duplicate_serviceescalation(xodtemplate_serviceescalation *temp_
                 new_escalationcondition->escalate_on_unknown=temp_escalationcondition->escalate_on_unknown;
                 new_escalationcondition->escalate_on_unreachable=temp_escalationcondition->escalate_on_unreachable;
                 new_escalationcondition->escalate_on_warning=temp_escalationcondition->escalate_on_warning;
+		new_escalationcondition->connector=temp_escalationcondition->connector;
                 
                 /* first escalation condition is head of the condition list */
                 if(new_serviceescalation->condition==NULL){





More information about the icinga-checkins mailing list