Merge pull request #36845 from Murena-SAS/reminder-iterator-exception

Fix max instances exception in get vevent call
nextcloud · Apr 17, 2023 · bdb09ab · bdb09ab
2 parents b21c5c8 + e823718
commit bdb09ab
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -147,7 +147,14 @@ public function processReminders() :void {
 				continue;
 			}
 
-			$vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);
+			try {
+				$vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);
+			} catch (MaxInstancesExceededException $e) {
+				$this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]);
+				$this->backend->removeReminder($reminder['id']);
+				continue;
+			}
+
 			if (!$vevent) {
 				$this->logger->debug('Reminder {id} does not belong to a valid event', [
 					'id' => $reminder['id'],