Verify return type

Can also be null. Silences another security warning...

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 6abefff4198ac67ae5fd90ed44856fc6110d1477..b8b1b8a50d6ea8ad8d962931831357c9277c988f 100644 (file)
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1253,7 +1253,7 @@ class View {
         * @param boolean|string $includeMountPoints true to add mountpoint sizes,
         * 'ext' to add only ext storage mount point sizes. Defaults to true.
         * defaults to true
-        * @return \OC\Files\FileInfo|bool False if file does not exist
+        * @return \OC\Files\FileInfo|false False if file does not exist
         */
        public function getFileInfo($path, $includeMountPoints = true) {
                $this->assertPathLength($path);

diff --git a/lib/private/preview.php b/lib/private/preview.php
index b2accdfd00ff1e703845c401283dd909510a9ead..38c043030fc7e0ac5d8913b9bde8e94b9a000e3e 100644 (file)
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -1250,7 +1250,7 @@ class Preview {
         * @param array $args
         * @param string $prefix
         */
-       public static function prepare_delete($args, $prefix = '') {
+       public static function prepare_delete(array $args, $prefix = '') {
                $path = $args['path'];
                if (substr($path, 0, 1) === '/') {
                        $path = substr($path, 1);
@@ -1259,7 +1259,11 @@ class Preview {
                $view = new \OC\Files\View('/' . \OC_User::getUser() . '/' . $prefix);
 
                $absPath = Files\Filesystem::normalizePath($view->getAbsolutePath($path));
-               self::addPathToDeleteFileMapper($absPath, $view->getFileInfo($path));
+               $fileInfo = $view->getFileInfo($path);
+               if($fileInfo === false) {
+                       return;
+               }
+               self::addPathToDeleteFileMapper($absPath, $fileInfo);
                if ($view->is_dir($path)) {
                        $children = self::getAllChildren($view, $path);
                        self::$deleteChildrenMapper[$absPath] = $children;