upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

properly unlock in case of failed fopen

Browse source
This commit is contained in:
Robin Appelman 2015-06-09 14:01:07 +02:00
parent 7d72f7d8ce
commit a4f808b11d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/files/view.php
View file

@ -999,7 +999,7 @@ class View {
throw $e;
}
if ((in_array('write', $hooks) || in_array('delete', $hooks)) && $operation !== 'fopen') {
if ((in_array('write', $hooks) || in_array('delete', $hooks)) && ($operation !== 'fopen' || $result === false)) {
$this->changeLock($path, ILockingProvider::LOCK_SHARED);
}
@ -1013,7 +1013,7 @@ class View {
$this->updater->update($path, $extraParam);
}
if ($operation === 'fopen' and $result) {
if ($operation === 'fopen' and is_resource($result)) {
$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
if (in_array('write', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);