sc/source/ui/docshell/docsh4.cxx | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 6d31671dcf809f56a1816d4af20fa495fd155055
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Dec 16 09:53:21 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 22 15:50:52 2022 +0000
sc: fix null deref in ScDocShell::Execute
See
https://crashreport.libreoffice.org/stats/signature/ScViewData::GetDispatcher()
Change-Id: I3271738b3c7f456adad1309c52195d98646f1acc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144302
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit bc30e84919b698b2d3b5a7330fbf646708b55d3d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144360
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 14f0bc4a4615..8b8220106b35 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1177,11 +1177,15 @@ void ScDocShell::Execute( SfxRequest& rReq )
#endif
case SID_OPEN_CALC:
{
- SfxStringItem aApp(SID_DOC_SERVICE,
"com.sun.star.sheet.SpreadsheetDocument");
- SfxStringItem aTarget(SID_TARGETNAME, "_blank");
- GetViewData()->GetDispatcher().ExecuteList(
- SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON,
- { &aApp, &aTarget });
+ ScViewData* pViewData = GetViewData();
+ if (pViewData)
+ {
+ SfxStringItem aApp(SID_DOC_SERVICE,
"com.sun.star.sheet.SpreadsheetDocument");
+ SfxStringItem aTarget(SID_TARGETNAME, "_blank");
+ pViewData->GetDispatcher().ExecuteList(
+ SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON,
+ { &aApp, &aTarget });
+ }
}
break;
case SID_NOTEBOOKBAR:
