Validate timeperiod segments

fixes #8309

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 17fe9da0368aa801ccb6e72d8a1624534cc6f8f5..fbb59eb1543b6688d107a57f07abe8694afc9dd8 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -381,6 +381,7 @@ bool ConfigItem::ActivateItems(void)
        }
 
        upq.Join();
+       upq.ReportExceptions("ConfigItem");
 
 #ifdef I2_DEBUG
        BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {

diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp
index 0ef7989911797725139c40b47c735c51876154f2..6e380ad8c3fad706e88465bf6c2b607691f30953 100644 (file)
--- a/lib/icinga/legacytimeperiod.cpp
+++ b/lib/icinga/legacytimeperiod.cpp
@@ -379,6 +379,9 @@ void LegacyTimePeriod::ProcessTimeRanges(const String& timeranges, tm *reference
 
        BOOST_FOREACH(const String& range, ranges) {
                Dictionary::Ptr segment = ProcessTimeRange(range, reference);
+               if (segment->Get("begin") >= segment->Get("end"))
+                       BOOST_THROW_EXCEPTION(std::invalid_argument("Time period segment ends before it begins"));
+
                result->Add(segment);
        }
 }