Merge pull request #30052 from nextcloud/backport/30046/stable22

[stable22] Close open cursor in the caldav back-end
nextcloud · Dec 3, 2021 · ef7800a · ef7800a
2 parents 93794bf + 88f3c5d
commit ef7800a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1899,6 +1899,7 @@ public function search(array $calendarInfo, $pattern, array $searchProperties,
 
 		$result = $outerQuery->executeQuery();
 		$calendarObjects = $result->fetchAll();
+		$result->closeCursor();
 
 		return array_map(function ($o) {
 			$calendarData = Reader::read($o['calendardata']);
@@ -2613,6 +2614,7 @@ public function getSchedulingObjects($principalUri) {
 				'size' => (int)$row['size'],
 			];
 		}
+		$stmt->closeCursor();
 
 		return $result;
 	}
@@ -2992,6 +2994,7 @@ public function deleteAllBirthdayCalendars() {
 			->executeQuery();
 
 		$ids = $result->fetchAll();
+		$result->closeCursor();
 		foreach ($ids as $id) {
 			$this->deleteCalendar(
 				$id['id'],