From b6c76f43a17822bc0d7eee0270e0c00bd6325865 Mon Sep 17 00:00:00 2001 From: Liam JACK Date: Sun, 12 Apr 2020 15:35:17 +0200 Subject: Fix #19066 - Array offset error due to empty file versions array Signed-off-by: Liam JACK --- apps/files_versions/lib/Storage.php | 5 +++++ apps/files_versions/tests/VersioningTest.php | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'apps/files_versions') diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index cb5a02581b5..2b896a0cf67 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -641,6 +641,11 @@ class Storage { } $firstVersion = reset($versions); + + if ($firstVersion === false) { + return [$toDelete, $size]; + } + $firstKey = key($versions); $prevTimestamp = $firstVersion['version']; $nextVersion = $firstVersion['version'] - $step; diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index 26429574364..b6d317ea25e 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -274,6 +274,11 @@ class VersioningTest extends \Test\TestCase { ], 9 // size of all deleted files (every file has the size 1) ], + // fourth set of versions: empty (see issue #19066) + [ + [], + 0 + ] ]; } -- cgit v1.2.3