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

Validate timeperiod segments

Browse Source 
fixes #8309
This commit is contained in:
Gunnar Beutner 2015-01-29 14:14:56 +01:00
parent a3e0c9d898
commit 2f44581f14
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/config/configitem.cpp
View File

@ -381,6 +381,7 @@ bool ConfigItem::ActivateItems(void)
} }
upq.Join(); upq.Join();
upq.ReportExceptions("ConfigItem");
#ifdef I2_DEBUG #ifdef I2_DEBUG
BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) { BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {

3
lib/icinga/legacytimeperiod.cpp
View File

@ -379,6 +379,9 @@ void LegacyTimePeriod::ProcessTimeRanges(const String& timeranges, tm *reference
BOOST_FOREACH(const String& range, ranges) { BOOST_FOREACH(const String& range, ranges) {
Dictionary::Ptr segment = ProcessTimeRange(range, reference); 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); result->Add(segment);
} }
} }