Take 2 on fix for Bug #14453

horde · Aug 27, 2016 · d39dd96 · d39dd96
1 parent 3caff29
commit d39dd96
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
@@ -322,6 +322,16 @@ static public function addEvents(&$results, &$event, $startDate, $endDate,
             $timezone = date_default_timezone_get();
         }
 
+        // If we are adding coverDates, but have no $endDate, default to
+        // +5 years from $startDate. This protects against hitting memory
+        // limit and other issues due to extremely long loops if a single event
+        // was added with a duration of thousands of years while still
+        // providing for reasonable alarm trigger times.
+        if ($coverDates && empty($endDate)) {
+            $endDate = clone $startDate;
+            $endDate->year += 5;
+        }
+
         if ($event->recurs() && $showRecurrence) {
             /* Recurring Event. */