From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 15 Mar 2013 12:29:25 +0000 (+0100)
Subject: Fix crash in TimePeriod::UpdateRegion().
X-Git-Tag: v0.0.2~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14c837a208918b4a33517c351e6ebc39126c7b60;p=icinga2

Fix crash in TimePeriod::UpdateRegion().
---

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