diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2019-01-25 17:47:15 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2019-02-08 22:15:40 +0100 |
commit | b79fe36b37cd02dfa992e26a30a2956d02a77ef9 (patch) | |
tree | e4d9f1ab70beb6f215508ba5866ea4d3d759c07f | |
parent | 170d475efa3cf61f412d02f2e7c25ce99e95dc2b (diff) |
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@collabora.com>
(cherry picked from commit 175274a6bca20451ccd6b5574e118265449f7642)
Reviewed-on: https://gerrit.libreoffice.org/66930
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | desktop/source/lib/init.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index dae96c2e62b6..739b21dbaf11 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1579,8 +1579,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) |