upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

fix(dav): Reduce memory usage while reading CardDAV cards

Browse source 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2024-11-05 09:26:16 +01:00
parent bd8348f5c1
commit 0dd86983bb
No known key found for this signature in database
GPG key ID: CC42AC2A7F0E56D8
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/CardDAV/CardDavBackend.php
View file

@ -519,6 +519,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$result = $query->executeQuery();
$row = $result->fetch();
if (!$row) {
$result->closeCursor();
return false;
}
$row['etag'] = '"' . $row['etag'] . '"';
@ -528,6 +529,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
if ($modified) {
$row['size'] = strlen($row['carddata']);
}
$result->closeCursor();
return $row;
}
@ -974,7 +976,12 @@ class CardDavBackend implements BackendInterface, SyncSupport {
*/
private function readBlob($cardData, &$modified = false) {
if (is_resource($cardData)) {
$cardData = stream_get_contents($cardData);
$stringCardData = stream_get_contents($cardData);
if ($stringCardData === false) {
return '';
}
fclose($cardData);
$cardData = $stringCardData;
}
// Micro optimisation