Skip to content

[stable19] Fix undefined index and consequential damages in versions code #23424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Oct 24, 2020
Merged

[stable19] Fix undefined index and consequential damages in versions code #23424

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92ac576
Fix undefined index and consequential damages in versions code
ChristophWurst Oct 8, 2020
2642509
Return all keys in getAllVersions() instead
MorrisJobke Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix undefined index and consequential damages in versions code 
If the user has no space and there are no versions, there won't be an
`all` index in the versions entry. Hence this triggers a warning and
becomes `null`, afterwards `count`, `foreach` and friends will happily
throw even more warnings and errors because they don't want to play with
`null`. Thus adding a fallback to an empty array.

Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst @backportbot
ChristophWurst authored and backportbot[bot] committed Oct 13, 2020
commit 92ac576e1c61cb75d45a34a7bc1836877a6c3a89
2 changes: 1 addition & 1 deletion apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ public static function expire($filename, $uid) {
// if still not enough free space we rearrange the versions from all files
if ($availableSpace <= 0) {
$result = Storage::getAllVersions($uid);
$allVersions = $result['all'];
$allVersions = $result['all'] ?? [];

foreach ($result['by_file'] as $versions) {
list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
Expand Down