[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Mar 12 12:57:47 UTC 2019


 desktop/source/lib/init.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fa568dced78011072390320f64eae28dd06d2b9
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Mar 10 12:21:33 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 12 13:57:24 2019 +0100

    LOK: don't segfault when reporting error
    
    Change-Id: Ia6d614eb15b15f43ddd3e0b5742b888060dfd581
    Reviewed-on: https://gerrit.libreoffice.org/69069
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 262b722ece7f..d2eee1b79866 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2988,7 +2988,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma
     else
         bResult = comphelper::dispatchCommand(aCommand, comphelper::containerToSequence(aPropertyValuesVector));
 
-    if (!bResult)
+    if (!bResult && gImpl)
     {
         gImpl->maLastExceptionMsg = "Failed to dispatch the .uno: command";
     }


More information about the Libreoffice-commits mailing list