Skip to content

Commit 7dd22b0

Browse files
authored
Merge pull request nextcloud#43982 from nextcloud/fixMemExaust
fix(filecache): Move from array_merge to avoid memory exhaustion on large scans
2 parents 3bad491 + 575159b commit 7dd22b0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lib/private/Files/Cache/Cache.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,13 @@ private function removeChildren(ICacheEntry $entry) {
585585
return $cacheEntry->getPath();
586586
}, $children);
587587

588-
$deletedIds = array_merge($deletedIds, $childIds);
589-
$deletedPaths = array_merge($deletedPaths, $childPaths);
588+
foreach ($childIds as $childId) {
589+
$deletedIds[] = $childId;
590+
}
591+
592+
foreach ($childPaths as $childPath) {
593+
$deletedPaths[] = $childPath;
594+
}
590595

591596
$query = $this->getQueryBuilder();
592597
$query->delete('filecache_extended')

0 commit comments

Comments
 (0)