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

Michael Meeks michael.meeks at collabora.com
Tue Nov 1 23:39:34 UTC 2016


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

New commits:
commit 2b9ae4b263c90f814c608e79c92cdb599d440a98
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Nov 1 23:38:25 2016 +0000

    DocumentBroker - hold mutex while iterating over _sessions.

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index eda6eeb..728f5fb 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -887,6 +887,8 @@ bool DocumentBroker::forwardToClient(const std::string& prefix, const std::vecto
 
 void DocumentBroker::childSocketTerminated()
 {
+    std::lock_guard<std::mutex> lock(_mutex);
+
     if (!_childProcess->isAlive())
     {
         Log::error("Child for doc [" + _docKey + "] terminated prematurely.");


More information about the Libreoffice-commits mailing list