From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 29 Mar 2015 06:05:01 +0000 (+0200)
Subject: Fix validation errors for time ranges which span the DST transition
X-Git-Tag: v2.3.4~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f97fded2434dbf3e608d12662ece5b9396511f13;p=icinga2

Fix validation errors for time ranges which span the DST transition

fixes #8892
---

diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp
index d78cc00f4..b346d3bc0 100644
--- a/lib/icinga/legacytimeperiod.cpp
+++ b/lib/icinga/legacytimeperiod.cpp
@@ -371,6 +371,10 @@ void LegacyTimePeriod::ProcessTimeRangeRaw(const String& timerange, tm *referenc
 	end->tm_sec = 0;
 	end->tm_min = Convert::ToLong(hd2[1]);
 	end->tm_hour = Convert::ToLong(hd2[0]);
+
+	if (begin->tm_hour * 3600 + begin->tm_min * 60 + begin->tm_sec >=
+	    end->tm_hour * 3600 + end->tm_min * 60 + end->tm_sec)
+		BOOST_THROW_EXCEPTION(std::invalid_argument("Time period segment ends before it begins"));
 }
 
 Dictionary::Ptr LegacyTimePeriod::ProcessTimeRange(const String& timestamp, tm *reference)
@@ -404,7 +408,7 @@ void LegacyTimePeriod::ProcessTimeRanges(const String& timeranges, tm *reference
 		}
 
 		if (segment->Get("begin") >= segment->Get("end"))
-			BOOST_THROW_EXCEPTION(std::invalid_argument("Time period segment ends before it begins"));
+			continue;
 
 		result->Add(segment);
 	}