Skip to content
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

Jump to bottom

Fix rmdir() to release possible directory lock prior to removing directory #45967

Closed
wants to merge 2 commits into from
Closed

Fix rmdir() to release possible directory lock prior to removing directory #45967

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cd9b88
Close directory iterator in order to release directory lock possibly …
dennisverspuij Jun 19, 2024
ba8bf69
Fix whitespace
dennisverspuij Jun 19, 2024
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
1 change: 1 addition & 0 deletions lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public function rmdir($path) {
}
$it->next();
}
unset($it);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That needs a comment to explain what it does.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see first commit message, I do not understand what else I need to explain about unsetting the iterator to free the directory lock.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to explain it in the code with a comment.
Otherwise this will get removed later or confuse future code readers.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I seem to have closed and messed up this PR, don;t know how I did that.
However, I reset the branch with a single proper commit with the desired comment, can you reopen this PR or should I create a new one with it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind, I created a new PR.

clearstatcache(true, $this->getSourcePath($path));
return rmdir($this->getSourcePath($path));
} catch (\UnexpectedValueException $e) {
Expand Down
Loading