tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash in ClusterEvents::SendNotificationsAPIHandler 

fixes #12718
This commit is contained in:
Gunnar Beutner 2016-09-13 22:14:11 +02:00
parent abd99efae7
commit 8fd454fbb1
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/icinga/clusterevents.cpp
View File

@ -126,13 +126,19 @@ Value ClusterEvents::CheckResultAPIHandler(const MessageOrigin::Ptr& origin, con
if (!params) if (!params)
return Empty; return Empty;
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr;
Array::Ptr vperf;
if (params->Contains("cr")) {
cr = new CheckResult();
Dictionary::Ptr vcr = params->Get("cr"); Dictionary::Ptr vcr = params->Get("cr");
Array::Ptr vperf = vcr->Get("performance_data"); vperf = vcr->Get("performance_data");
vcr->Remove("performance_data"); vcr->Remove("performance_data");
Deserialize(cr, vcr, true);
}
Deserialize(cr, params->Get("cr"), true); if (!cr)
return Empty;
Array::Ptr rperf = new Array(); Array::Ptr rperf = new Array();
@ -826,13 +832,15 @@ Value ClusterEvents::SendNotificationsAPIHandler(const MessageOrigin::Ptr& origi
return Empty; return Empty;
} }
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr;
if (params->Contains("cr")) {
cr = new CheckResult();
Dictionary::Ptr vcr = params->Get("cr"); Dictionary::Ptr vcr = params->Get("cr");
Array::Ptr vperf = vcr->Get("performance_data"); Array::Ptr vperf = vcr->Get("performance_data");
vcr->Remove("performance_data"); vcr->Remove("performance_data");
Deserialize(cr, vcr, true);
Deserialize(cr, params->Get("cr"), true); }
NotificationType type = static_cast<NotificationType>(static_cast<int>(params->Get("type"))); NotificationType type = static_cast<NotificationType>(static_cast<int>(params->Get("type")));
String author = params->Get("author"); String author = params->Get("author");
@ -910,13 +918,15 @@ Value ClusterEvents::NotificationSentUserAPIHandler(const MessageOrigin::Ptr& or
return Empty; return Empty;
} }
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr;
if (params->Contains("cr")) {
cr = new CheckResult();
Dictionary::Ptr vcr = params->Get("cr"); Dictionary::Ptr vcr = params->Get("cr");
Array::Ptr vperf = vcr->Get("performance_data"); Array::Ptr vperf = vcr->Get("performance_data");
vcr->Remove("performance_data"); vcr->Remove("performance_data");
Deserialize(cr, vcr, true);
Deserialize(cr, params->Get("cr"), true); }
NotificationType type = static_cast<NotificationType>(static_cast<int>(params->Get("type"))); NotificationType type = static_cast<NotificationType>(static_cast<int>(params->Get("type")));
String author = params->Get("author"); String author = params->Get("author");
@ -1016,13 +1026,15 @@ Value ClusterEvents::NotificationSentToAllUsersAPIHandler(const MessageOrigin::P
return Empty; return Empty;
} }
CheckResult::Ptr cr = new CheckResult(); CheckResult::Ptr cr;
if (params->Contains("cr")) {
cr = new CheckResult();
Dictionary::Ptr vcr = params->Get("cr"); Dictionary::Ptr vcr = params->Get("cr");
Array::Ptr vperf = vcr->Get("performance_data"); Array::Ptr vperf = vcr->Get("performance_data");
vcr->Remove("performance_data"); vcr->Remove("performance_data");
Deserialize(cr, vcr, true);
Deserialize(cr, params->Get("cr"), true); }
NotificationType type = static_cast<NotificationType>(static_cast<int>(params->Get("type"))); NotificationType type = static_cast<NotificationType>(static_cast<int>(params->Get("type")));
String author = params->Get("author"); String author = params->Get("author");