[Pkg-owncloud-commits] [owncloud] 414/457: properly unlock in case of failed fopen

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit a4f808b11d2e49e4c73a910a12574df177b2f5c7
Author: Robin Appelman <icewind at owncloud.com>
Date:   Tue Jun 9 14:01:07 2015 +0200

    properly unlock in case of failed fopen
---
 lib/private/files/view.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index f410fdc..c5494b9 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git