Close cursors

2 files changed, 8 insertions, 6 deletions

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 886dcd4f6d8..17479c490a9 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -621,7 +621,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		}
 
 		$chunks = array_chunk($uris, 100);
-		$result = [];
+		$objects = [];
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
@@ -631,10 +631,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 
 		foreach ($chunks as $uris) {
 			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$stmt = $query->execute();
+			$result = $query->execute();
 
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-				$result[] = [
+			while ($row = $result->fetch()) {
+				$objects[] = [
 					'id'           => $row['id'],
 					'uri'          => $row['uri'],
 					'lastmodified' => $row['lastmodified'],
@@ -646,8 +646,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 					'classification' => (int)$row['classification']
 				];
 			}
+			$result->closeCursor();
 		}
-		return $result;
+		return $objects;
 	}
 
 	/**
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index f7e0a017803..3aab2712125 100644
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -499,11 +499,12 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
 			$result = $query->execute();
 
-			while($row = $result->fetch()) {
+			while ($row = $result->fetch()) {
 				$row['etag'] = '"' . $row['etag'] . '"';
 				$row['carddata'] = $this->readBlob($row['carddata']);
 				$cards[] = $row;
 			}
+			$result->closeCursor();
 		}
 		return $cards;
 	}