improve validation of getFileInfo in \OC\Preview

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 8cef1ade01bfdc61ace168cddada95fbbb64f744..1f797c7e994f81c6b914c4a5940603bb4be83d7b 100755 (executable)
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -189,7 +189,10 @@ class Preview {
                $this->file = $file;
                $this->info = null;
                if ($file !== '') {
-                       $this->mimetype = $this->getFileInfo()->getMimetype();
+                       $this->getFileInfo();
+                       if($this->info !== null && $this->info !== false) {
+                               $this->mimetype = $this->info->getMimetype();
+                       }
                }
                return $this;
        }
@@ -282,10 +285,13 @@ class Preview {
                $file = $this->getFile();
 
                $fileInfo = $this->getFileInfo($file);
-               $fileId = $fileInfo->getId();
+               if($fileInfo !== null && $fileInfo !== false) {
+                       $fileId = $fileInfo->getId();
 
-               $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png';
-               return $this->userView->unlink($previewPath);
+                       $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png';
+                       return $this->userView->unlink($previewPath);
+               }
+               return false;
        }
 
        /**
@@ -296,11 +302,14 @@ class Preview {
                $file = $this->getFile();
 
                $fileInfo = $this->getFileInfo($file);
-               $fileId = $fileInfo->getId();
+               if($fileInfo !== null && $fileInfo !== false) {
+                       $fileId = $fileInfo->getId();
 
-               $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
-               $this->userView->deleteAll($previewPath);
-               return $this->userView->rmdir($previewPath);
+                       $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+                       $this->userView->deleteAll($previewPath);
+                       return $this->userView->rmdir($previewPath);
+               }
+               return false;
        }
 
        /**
@@ -406,6 +415,9 @@ class Preview {
                $scalingUp = $this->getScalingUp();
 
                $fileInfo = $this->getFileInfo($file);
+               if($fileInfo === null || $fileInfo === false) {
+                       return new \OC_Image();
+               }
                $fileId = $fileInfo->getId();
 
                $cached = $this->isCached();