tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in TimePeriod::UpdateRegion().

Browse Source
This commit is contained in:
Gunnar Beutner 2013-03-15 13:29:25 +01:00
parent e683de5ab8
commit 14c837a208
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/icinga/timeperiod.cpp
View File

@ -210,6 +210,7 @@ void TimePeriod::UpdateRegion(double begin, double end)
ObjectLock olock(this); ObjectLock olock(this);
RemoveSegment(begin, end); RemoveSegment(begin, end);
ObjectLock dlock(segments);
BOOST_FOREACH(const Dictionary::Ptr& segment, segments) { BOOST_FOREACH(const Dictionary::Ptr& segment, segments) {
AddSegment(segment); AddSegment(segment);
} }
@ -284,9 +285,9 @@ void TimePeriod::EmptyTimePeriodUpdate(const ScriptTask::Ptr& task, const vector
if (arguments.size() < 3) if (arguments.size() < 3)
BOOST_THROW_EXCEPTION(runtime_error("Expected 3 arguments.")); BOOST_THROW_EXCEPTION(runtime_error("Expected 3 arguments."));
TimePeriod::Ptr tp = arguments[0]; // TimePeriod::Ptr tp = arguments[0];
double begin = arguments[1]; // double begin = arguments[1];
double end = arguments[2]; // double end = arguments[2];
Array::Ptr segments = boost::make_shared<Array>(); Array::Ptr segments = boost::make_shared<Array>();
task->FinishResult(segments); task->FinishResult(segments);