sw/source/uibase/app/docsh2.cxx | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit ace3079172ed55d7408193a2f37bc9b16d1b3c39
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Mar 16 16:26:17 2023 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Mar 24 16:23:36 2023 +0000
sw: fix null dereference
See
https://crashreport.libreoffice.org/stats/signature/SfxDispatcher::ExecuteList(unsigned%20short,SfxCallMode,std::initializer_list%3CSfxPoolItem%20const%20*%3E,std::initializer_list%3CSfxPoolItem%20const%20*%3E)
Change-Id: I7f5471f003798f260d9d015782bd2a798baa22d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148999
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 11ce7e810ef5ba540afe676d58575fabf4ab386d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149018
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit b524e2fcb52a28bd24854c23a8f5eedf10d9552e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149099
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index bc9647d77dd7..d8195b7e200d 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1197,11 +1197,12 @@ void SwDocShell::Execute(SfxRequest& rReq)
// Ok. I did my best.
break;
- SfxStringItem aApp(SID_DOC_SERVICE,
"com.sun.star.text.TextDocument");
- SfxStringItem aTarget(SID_TARGETNAME, "_blank");
- pViewShell->GetDispatcher()->ExecuteList(SID_OPENDOC,
- SfxCallMode::API|SfxCallMode::SYNCHRON,
- { &aApp, &aTarget });
+ if (SfxDispatcher* pDispatch = pViewShell->GetDispatcher())
+ {
+ SfxStringItem aApp(SID_DOC_SERVICE,
"com.sun.star.text.TextDocument");
+ SfxStringItem aTarget(SID_TARGETNAME, "_blank");
+ pDispatch->ExecuteList(SID_OPENDOC,
SfxCallMode::API|SfxCallMode::SYNCHRON, { &aApp, &aTarget });
+ }
}
break;
case SID_CLASSIFICATION_APPLY:
