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

[Miklos Vajna (via logerrit)]

 sw/source/core/frmedt/feshview.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1a651f925090afd69b78ab0311e53ab85b48d8e2
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Dec 8 12:58:22 2021 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Dec 9 10:28:10 2021 +0100

    sw: fix crash in SwFEShell::SelectObj()
    
    Crashreport signature:
    
            SwContact::GetFormat()
                    sw/inc/dcontact.hxx:112
            SwFEShell::SelectObj(Point const&, unsigned char, SdrObject*)
                    sw/source/core/frmedt/feshview.cxx:292
            SwWrtShell::UnSelectFrame()
                    sw/source/uibase/wrtsh/select.cxx:326
            SwWrtShell::DelRight()
                    sw/source/uibase/wrtsh/delete.cxx:467
            SwBaseShell::ExecDelete(SfxRequest&)
                    sw/source/uibase/shells/basesh.cxx:198
    
    I.e. it seems that in case we're in the middle of a delete, then it's
    possible that the mark list contains an SdrObject that doesn't have a
    matching SwClient anymore. Ignore such SdrObjects when looking for the
    textbox of a draw shape.
    
    Change-Id: I065b2ea44d39220184a5f604c3ea13f6a106ddb0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126537
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 2a6fde04a7ad716117118e5dada895ec87e24de3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126564

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 8935aea0c62b..2a810d87225f 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -298,7 +298,13 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 
nFlag, SdrObject *pObj )
         for (size_t i = 0; i < rMrkList.GetMarkCount(); ++i)
         {
             SdrObject* pObject = rMrkList.GetMark(i)->GetMarkedSdrObj();
-            SwFrameFormat* pFormat = GetUserCall(pObject)->GetFormat();
+            SwContact* pContact = GetUserCall(pObject);
+            if (!pContact)
+            {
+                continue;
+            }
+
+            SwFrameFormat* pFormat = pContact->GetFormat();
             if (SwFrameFormat* pShapeFormat = 
SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_FLYFRMFMT))
             {
                 SdrObject* pShape = pShapeFormat->FindSdrObject();