[Libreoffice-commits] online.git: kit/Kit.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Jan 2 06:06:38 UTC 2017


 kit/Kit.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f0524b3ac945dd98b5106f961cc48de9e4a79bee
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jan 1 13:06:13 2017 -0500

    wsd: must have document lock when accessing LoKit instance
    
    Change-Id: Ie26178448fb513ed08acc61ec34c1af97e76eda8
    Reviewed-on: https://gerrit.libreoffice.org/32617
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 4b67507..fb1464a 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -552,6 +552,8 @@ public:
                 " passwordProvided=" << _haveDocPassword <<
                 " password='" << _docPassword <<  "'");
 
+        Util::assertIsLocked(_documentMutex);
+
         if (_isDocPasswordProtected && _haveDocPassword)
         {
             // it means this is the second attempt with the wrong password; abort the load operation


More information about the Libreoffice-commits mailing list