From ada94b8d4391e38129c82129642e45a43984213e Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Sun, 26 Jun 2016 19:28:33 +0200
Subject: [PATCH] fix some scrutinizer "bugs"

---
 api/src/Vfs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/Vfs.php b/api/src/Vfs.php
index a635e96e58..f23a32464e 100644
--- a/api/src/Vfs.php
+++ b/api/src/Vfs.php
@@ -1620,7 +1620,7 @@ class Vfs extends Vfs\StreamWrapper
 	{
 		// we require write rights to lock/unlock a resource
 		if (!$path || $update && !$token || $check_writable &&
-			!(self::is_writable($path) || !self::file_exists($path) && self::is_writable(self::dirname($path))))
+			!(self::is_writable($path) || !self::file_exists($path) && ($dir=self::dirname($path)) && self::is_writable($dir)))
 		{
 			return false;
 		}
@@ -2050,7 +2050,7 @@ class Vfs extends Vfs\StreamWrapper
 			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !is_uploaded_file()");
 			return false;
 		}
-		if (!(self::is_writable($target) || self::is_writable(self::dirname($target))))
+		if (!(self::is_writable($target) || ($dir = self::dirname($target)) && self::is_writable($dir)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($tmp_name, $target, ".array2string($props).",$check_is_uploaded_file) returning FALSE !writable");
 			return false;