[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 7c2893de81a25db4279ae8da0ef030a596f36b56
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Sep 3 09:28:39 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Sep 3 12:13:21 2021 +0200

    sw: fix crash in SwView::Execute()
    
    Crashreport:
    
            program/../program/libswlo.so
                    SwView::Execute(SfxRequest&)
                            sw/source/uibase/uiview/view2.cxx:1312
            program/libmergedlo.so
                    SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool)
                            sfx2/source/control/dispatch.cxx:263
            /opt/collaboraoffice6.4/program/libmergedlo.so
                    SfxDispatcher::Execute_(SfxShell&, SfxSlot const&, SfxRequest&, SfxCallMode)
                            sfx2/source/control/dispatch.cxx:760 (discriminator 3)
            /opt/collaboraoffice6.4/program/libmergedlo.so
                    SfxDispatcher::Execute(unsigned short, SfxCallMode, SfxItemSet const*, SfxItemSet const*, unsigned short)
                            sfx2/source/control/dispatch.cxx:819
    
    Change-Id: I2e7b27f458971dbd33971589f71337c59981ee83
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121547
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 1e2356884137..9820b695d7cb 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1309,6 +1309,11 @@ void SwView::Execute(SfxRequest &rReq)
                 const sal_uLong newPosY = newPosYTwips->GetValue();
                 const Point mPoint(newPosX, newPosY);
                 const SdrHdl* handle = pSdrView->GetHdlList().GetHdl(handleNum);
+                if (!handle)
+                {
+                    break;
+                }
+
                 if (handle->GetKind() == SdrHdlKind::Anchor || handle->GetKind() == SdrHdlKind::Anchor_TR)
                     m_pWrtShell->FindAnchorPos(mPoint, /*bMoveIt=*/true);
                 else