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

Fix: missing check_command attribute results in sigsegv on check execution 

Fixes #4331
This commit is contained in:
Gunnar Beutner 2013-06-24 09:30:49 +02:00
parent 2b1c268ecd
commit b0ac607caf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/icinga-type.conf
View File

@ -50,6 +50,8 @@ type Host {
%attribute string "*" %attribute string "*"
}, },
%attribute name(CheckCommand) "check_command",
%attribute name(TimePeriod) "check_period", %attribute name(TimePeriod) "check_period",
%attribute number "check_interval", %attribute number "check_interval",
%attribute number "retry_interval", %attribute number "retry_interval",
@ -331,4 +333,4 @@ type NotificationCommand inherits Command {
type EventCommand inherits Command { type EventCommand inherits Command {
} }

7
lib/icinga/service-check.cpp
View File

@ -582,7 +582,12 @@ void Service::ExecuteCheck(void)
Dictionary::Ptr result; Dictionary::Ptr result;
try { try {
result = GetCheckCommand()->Execute(GetSelf()); CheckCommand::Ptr command = GetCheckCommand();
if (!command)
return;
result = command->Execute(GetSelf());
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "Exception occured during check for service '" msgbuf << "Exception occured during check for service '"