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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Tue Mar 28 05:14:59 UTC 2017


 wsd/DocumentBroker.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 99844c1c924e6c2de8011c9f680151f228e74f61
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue Mar 28 01:05:18 2017 -0400

    wsd: protect DocBrokers session member
    
    It is accessed from the PrisonerPoll
    when cleaning up.
    
    Change-Id: Ieb57cdd63cc08632bcdaa4fc5ccd4a1a53c06fe7
    Reviewed-on: https://gerrit.libreoffice.org/35788
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 32f55aae..83e00329 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -525,6 +525,8 @@ bool DocumentBroker::saveToStorageInternal(const std::string& sessionId,
         return true;
     }
 
+    std::unique_lock<std::mutex> lock(_mutex);
+
     const auto it = _sessions.find(sessionId);
     if (it == _sessions.end())
     {


More information about the Libreoffice-commits mailing list