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 ConfigItem::RunWithActivationContext 

fixes #11085
This commit is contained in:
Gunnar Beutner 2016-02-04 13:17:37 +01:00
parent b3b2eb856b
commit 6cd931726d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/config/configitem.cpp
View File

@ -521,8 +521,6 @@ bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& u
return false; return false;
} }
ASSERT(newItems.size() > 0);
ApplyRule::CheckMatches(); ApplyRule::CheckMatches();
/* log stats for external parsers */ /* log stats for external parsers */
@ -593,6 +591,9 @@ bool ConfigItem::RunWithActivationContext(const Function::Ptr& function)
{ {
ActivationScope scope; ActivationScope scope;
if (!function)
BOOST_THROW_EXCEPTION(ScriptError("'function' argument must not be null."));
{ {
ScriptFrame frame; ScriptFrame frame;
function->Invoke(); function->Invoke();