[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp loolwsd/Storage.cpp

[Jan Holesovsky]

 loolwsd/DocumentBroker.cpp |    2 +-
 loolwsd/Storage.cpp        |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2090f121b61c34a2285430f495aee88c24ebc2e4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Aug 31 17:05:10 2016 +0200

    Don't check for nullptr after dereferencing.
    
    StorageBase::create() is supposed to throw when there are trouble.

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index e583279..a2f1d12 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -130,7 +130,7 @@ const StorageBase::FileInfo DocumentBroker::validate(const Poco::URI& uri)
         auto storage = StorageBase::create("", "", uri);
         auto fileinfo = storage->getFileInfo(uri);
         Log::info("After checkfileinfo: " + fileinfo._filename);
-        if (storage == nullptr || !fileinfo.isValid())
+        if (!fileinfo.isValid())
         {
             throw BadRequestException("Invalid URI or access denied.");
         }
diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index 7deba6a..e066f6f 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -138,6 +138,8 @@ std::unique_ptr<StorageBase> StorageBase::create(const std::string& jailRoot, co
     if (UnitWSD::get().createStorage(jailRoot, jailPath, uri, storage))
     {
         Log::info("Storage load hooked.");
+        if (storage)
+            return storage;
     }
     else if (uri.isRelative() || uri.getScheme() == "file")
     {