[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ad322cd74e9540dc37dff8f599ade60c4d2bf9a2
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jan 25 17:47:15 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 28 22:14:25 2019 +0100

    lok: don't crash in simple LOK use-case with no callback.
    
    Change-Id: I7bceba10f002ad5751e3d810f9a9767ad2e875bc
    Reviewed-on: https://gerrit.libreoffice.org/66924
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 175274a6bca20451ccd6b5574e118265449f7642)
    Reviewed-on: https://gerrit.libreoffice.org/66929
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a7ce8182ebd1..4964859eb664 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1522,8 +1522,11 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
         }
 
         LibLODocument_Impl* pDocument = new LibLODocument_Impl(xComponent);
-        int nState = doc_getSignatureState(pDocument);
-        pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS, OString::number(nState).getStr(), pLib->mpCallbackData);
+        if (pLib->mpCallback)
+        {
+            int nState = doc_getSignatureState(pDocument);
+            pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS, OString::number(nState).getStr(), pLib->mpCallbackData);
+        }
         return pDocument;
     }
     catch (const uno::Exception& exception)