Merge pull request #23563 from nextcloud/backport/23497/stable20

rullzer · web-flow · commit 1ab03a0d3e8f · 2020-10-24T10:57:58.000+02:00
[stable20] CalDavBackend: check if timerange is array before accessing
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -16,6 +16,7 @@
  * @author Thomas Citharel <nextcloud@tcit.fr>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vinicius Cubas Brand <vinicius@eita.org.br>
+ * @author Simon Spannagel <simonspa@kth.se>
  *
  * @license AGPL-3.0
  *
@@ -1364,7 +1365,7 @@ public function calendarQuery($calendarId, array $filters, $calendarType=self::C
 				$requirePostFilter = false;
 			}
 			// There was a time-range filter
-			if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
+			if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range']) && is_array($filters['comp-filters'][0]['time-range'])) {
 				$timeRange = $filters['comp-filters'][0]['time-range'];
 
 				// If start time OR the end time is not specified, we can do a

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`* @author Thomas Citharel <[email protected]>`
`17`	`17`	`* @author Thomas Müller <[email protected]>`
`18`	`18`	`* @author Vinicius Cubas Brand <[email protected]>`
	`19`	`+ * @author Simon Spannagel <[email protected]>`
`19`	`20`	`*`
`20`	`21`	`* @license AGPL-3.0`
`21`	`22`	`*`
`@@ -1364,7 +1365,7 @@ public function calendarQuery($calendarId, array $filters, $calendarType=self::C`
`1364`	`1365`	`$requirePostFilter = false;`
`1365`	`1366`	`}`
`1366`	`1367`	`// There was a time-range filter`
`1367`		`- if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {`
	`1368`	`+ if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range']) && is_array($filters['comp-filters'][0]['time-range'])) {`
`1368`	`1369`	`$timeRange = $filters['comp-filters'][0]['time-range'];`
`1369`	`1370`
`1370`	`1371`	`// If start time OR the end time is not specified, we can do a`