[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Miklos Vajna (via logerrit)]

 sfx2/source/view/lokhelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcb94a7da148f9da6bbb2b7fb9e4cda72e2de5d2
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Aug 17 08:24:05 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 17 10:03:09 2023 +0200

    sfx2: fix crash in SfxLokHelper::notifyOtherView()
    
    Crashreport signature:
    
    Fatal signal received: SIGSEGV code: 1 for address: 0x0
    program/libmergedlo.so
            SfxLokHelper::notifyOtherView(SfxViewShell const*, SfxViewShell 
const*, int, boost::property_tree::basic_ptree<std::string, std::string, 
std::less<std::string> > const&)
                    sfx2/source/view/lokhelper.cxx:473
    program/libmergedlo.so
            ImpEditView::ShowCursor(bool, bool)
                    editeng/source/editeng/impedit.cxx:1423
    program/../program/libsclo.so
            ScViewData::SetEditEngine(ScSplitPos, ScEditEngineDefaulter*, 
vcl::Window*, short, int)
                    sc/source/ui/view/viewdata.cxx:1635
    program/libsclo.so
            ScTabView::UpdateEditView()
                    sc/source/ui/view/tabview3.cxx:2190
    
    Change-Id: I219a1e9685db9bc3ea03d6ab67ff5db74aac9343
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155753
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index b4d873971416..b24cee1ecc55 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -466,7 +466,7 @@ void SfxLokHelper::notifyOtherView(const SfxViewShell* 
pThisView, SfxViewShell c
                                    int nType, const 
boost::property_tree::ptree& rTree)
 {
     assert(pThisView != nullptr && "pThisView must be valid");
-    if (DisableCallbacks::disabled())
+    if (DisableCallbacks::disabled() || !pOtherView)
         return;
 
     const int viewId = SfxLokHelper::getView(pThisView);