Skip to content

[stable30] fix(shares): Fix infinite loop when all shares are invalid #57105

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

Closed
backportbot wants to merge 1 commit into from
Closed

[stable30] fix(shares): Fix infinite loop when all shares are invalid #57105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,6 @@ public function getSharesBy($userId, $shareType, $path = null, $reshares = false
continue;
}

$added++;
$shares2[] = $share;

if (count($shares2) === $limit) {
Expand Down Expand Up @@ -1469,11 +1468,14 @@ public function getShareByToken($token) {
/**
* Check expire date and disabled owner
*
* @param int &$added If given, will be decremented if the share is deleted
* @throws ShareNotFound
*/
protected function checkShare(IShare $share): void {
private function checkShare(IShare $share, int &$added = 1): void {
if ($share->isExpired()) {
$this->deleteShare($share);
// Remove 1 to added, because this share was deleted
$added--;
throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
}
if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') {
Expand Down