From 338cd4033ac0662a4077825d2084f53645af1865 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Jun 2016 13:31:45 +0200
Subject: [PATCH] handle invalid storages in LazyStorageMountInfo

---
 .../Files/Config/LazyStorageMountInfo.php        |  8 ++++++--
 lib/private/Files/Config/UserMountCache.php      | 16 ++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/private/Files/Config/LazyStorageMountInfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php
index 654c5b2b23..5df04c4b78 100644
--- a/lib/private/Files/Config/LazyStorageMountInfo.php
+++ b/lib/private/Files/Config/LazyStorageMountInfo.php
@@ -28,7 +28,7 @@ use OCP\Files\Node;
 use OCP\IUser;
 
 class LazyStorageMountInfo extends CachedMountInfo {
-	/** @var IMountPoint  */
+	/** @var IMountPoint */
 	private $mount;
 
 	/**
@@ -47,7 +47,11 @@ class LazyStorageMountInfo extends CachedMountInfo {
 	 */
 	public function getStorageId() {
 		if (!$this->storageId) {
-			$this->storageId = $this->mount->getStorage()->getStorageCache()->getNumericId();
+			$storage = $this->mount->getStorage();
+			if (!$storage) {
+				return -1;
+			}
+			$this->storageId = $storage->getStorageCache()->getNumericId();
 		}
 		return parent::getStorageId();
 	}
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index edb1525b27..c947004860 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -124,12 +124,16 @@ class UserMountCache implements IUserMountCache {
 	}
 
 	private function addToCache(ICachedMountInfo $mount) {
-		$this->connection->insertIfNotExist('*PREFIX*mounts', [
-			'storage_id' => $mount->getStorageId(),
-			'root_id' => $mount->getRootId(),
-			'user_id' => $mount->getUser()->getUID(),
-			'mount_point' => $mount->getMountPoint()
-		], ['root_id', 'user_id']);
+		if ($mount->getStorageId() !== -1) {
+			$this->connection->insertIfNotExist('*PREFIX*mounts', [
+				'storage_id' => $mount->getStorageId(),
+				'root_id' => $mount->getRootId(),
+				'user_id' => $mount->getUser()->getUID(),
+				'mount_point' => $mount->getMountPoint()
+			], ['root_id', 'user_id']);
+		} else {
+			$this->logger->error('Error getting storage info for mount at ' . $mount->getMountPoint());
+		}
 	}
 
 	private function setMountPoint(ICachedMountInfo $mount) {