[Libreoffice-commits] online.git: loolwsd/Admin.cpp loolwsd/Storage.hpp loolwsd/Util.hpp

[Miklos Vajna]

 loolwsd/Admin.cpp   |    5 ++++-
 loolwsd/Storage.hpp |   16 +++++++++++++++-
 loolwsd/Util.hpp    |    2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 8ded538d40bce766628785936a94dd82ddabfe4e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 26 08:44:40 2016 +0200

    Admin: fix uninitialized members
    
    Change-Id: I8b88af167bf26e485e6d9600f88f015c65c1359b

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index bf0423f..3ef735f 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -230,6 +230,7 @@ void AdminRequestHandler::handleWSRequests(HTTPServerRequest& request, HTTPServe
 
 AdminRequestHandler::AdminRequestHandler(Admin* adminManager)
     : _admin(adminManager),
+      _sessionId(0),
       _isAuthenticated(false)
 {
 }
@@ -280,7 +281,9 @@ void AdminRequestHandler::handleRequest(HTTPServerRequest& request, HTTPServerRe
 
 /// An admin command processor.
 Admin::Admin() :
-    _model(AdminModel())
+    _model(AdminModel()),
+    _modelMutex(),
+    _forKitPid(0)
 {
     Log::info("Admin ctor.");
 
diff --git a/loolwsd/Storage.hpp b/loolwsd/Storage.hpp
index 4f7e120..6ab3e93 100644
--- a/loolwsd/Storage.hpp
+++ b/loolwsd/Storage.hpp
@@ -31,6 +31,19 @@ public:
     class FileInfo
     {
     public:
+        FileInfo(const std::string& filename,
+                 const Poco::Timestamp& modifiedTime,
+                 size_t size,
+                 const std::string& userId,
+                 const std::string& userName)
+            : _filename(filename),
+              _modifiedTime(modifiedTime),
+              _size(size),
+              _userId(userId),
+              _userName(userName)
+        {
+        }
+
         bool isValid() const
         {
             return !_filename.empty() && _size > 0;
@@ -50,7 +63,8 @@ public:
                 const std::string& uri) :
         _localStorePath(localStorePath),
         _jailPath(jailPath),
-        _uri(uri)
+        _uri(uri),
+        _fileInfo("", Poco::Timestamp(), 0, "", "")
     {
         Log::debug("Storage ctor: " + uri);
     }
diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index c69315e..6c94500 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -179,7 +179,7 @@ namespace Util
                 {
                     // Not performance critical to warrant caching.
                     Poco::RegularExpression re(value, Poco::RegularExpression::RE_CASELESS);
-                    Poco::RegularExpression::Match reMatch;
+                    Poco::RegularExpression::Match reMatch{};
 
                     // Must be a full match.
                     if (re.match(subject, reMatch) && reMatch.offset == 0 && reMatch.length == subject.size())