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

[Aron Budea (via logerrit)]

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

New commits:
commit ede43e54ed7f89a20906ae84d9447eeb3412bc7f
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Thu Jan 26 03:31:24 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Feb 3 21:55:40 2023 +0100

    sfx2: fix crash in SfxLokHelper::notifyAllViews(...)
    
    Crashreport signature:
    
    program/libmergedlo.so
            SfxLokHelper::notifyAllViews(int, rtl::OString const&)
                    sfx2/source/view/lokhelper.cxx:682
    program/libmergedlo.so
            SfxClipboardChangeListener::ChangedContents()
                    include/rtl/string.hxx:413
    program/libmergedlo.so
            SfxClipboardChangeListener::LinkStubAsyncExecuteHdl_Impl(void*, 
void*)
                    include/rtl/ref.hxx:128
    program/libmergedlo.so
            ImplWindowFrameProc(vcl::Window*, SalEvent, void const*)
                    include/rtl/ref.hxx:128
    program/libmergedlo.so
            SvpSalInstance::ProcessEvent(SalUserEventList::SalUserEvent)
    
    Change-Id: Ibf70f42292d67a3d6cc68f579ee02f671da85acb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146150
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    (cherry picked from commit dc17158c99c8a15fbca57a9a0b0ea7178dcc5a34)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146400
    Tested-by: Jenkins
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 53c2abace8b5..29f64adbb74b 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -676,6 +676,8 @@ void SfxLokHelper::notifyAllViews(int nType, const OString& 
rPayload)
 
     const auto payload = rPayload.getStr();
     const SfxViewShell* const pCurrentViewShell = SfxViewShell::Current();
+    if (!pCurrentViewShell)
+        return;
     SfxViewShell* pViewShell = SfxViewShell::GetFirst();
     while (pViewShell)
     {