[Libreoffice-commits] core.git: svx/source

[Miklos Vajna (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e68bce7df95f386e5cbd5c1fd90c5baeedb9a66
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Sep 14 08:23:44 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Sep 14 09:28:50 2021 +0200

    svx: GetMarkedObjectByIndex() may return nullptr
    
    Seen in this crash:
    
            #6  SdrMarkView::ImpIsFrameHandles() const (this=this at entry=0x7f5a310) at svx/source/svdraw/svdmrkv.cxx:594
            #7  0x00007f9779c71058 in SdrMarkView::HasMarkablePoints() const (this=0x7f5a310) at svx/source/svdraw/svdmrkv1.cxx:32
            #8  0x00007f9779d0c142 in SdrView::GetContext() const (this=0x7f5a310) at svx/source/svdraw/svdview.cxx:1297
            #9  0x00007f976185adf4 in SwWrtShell::GetSelectionType() const (this=this at entry=0x7f32d90) at sw/source/uibase/wrtsh/wrtsh1.cxx:1424
            #10 0x00007f9760e3d5b9 in SwCursorShell::sendLOKCursorUpdates() (this=this at entry=0x7f32d90) at sw/source/core/crsr/crsrsh.cxx:2055
            #11 0x00007f9760e4046b in SwCursorShell::UpdateCursor(unsigned short, bool) (this=this at entry=0x7f32d90, eFlags=eFlags at entry=6, bIdleEnd=bIdleEnd at entry=false)
                at sw/source/core/crsr/crsrsh.cxx:2041
            #12 0x00007f9760e41747 in SwCursorShell::EndAction(bool) (this=0x7f32d90, bIdleEnd=bIdleEnd at entry=false) at sw/source/core/crsr/crsrsh.cxx:276
            #13 0x00007f976105865a in SwEditShell::EndAllAction() (this=this at entry=0x7e98ed0) at sw/source/core/edit/edws.cxx:102
            #14 0x00007f976109f8ed in SwFEShell::DelSelectedObj() (this=0x7e98ed0) at sw/source/core/frmedt/feshview.cxx:2295
            #15 0x00007f976184a447 in SwWrtShell::DelRight() (this=this at entry=0x7e98ed0) at sw/source/uibase/wrtsh/delete.cxx:442
            #16 0x00007f9761680d6b in SwEditWin::Command(CommandEvent const&) (this=0x7e9ba10, rCEvt=...) at sw/source/uibase/docvw/edtwin.cxx:5483
    
    Change-Id: I916be9ce846c8750acdaf5fc791e1adb3692e002
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122076
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 582c9773f685..442719ad15e8 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -594,7 +594,7 @@ bool SdrMarkView::ImpIsFrameHandles() const
     if (nMarkCount==1 && bStdDrag && bFrmHdl)
     {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
-        if (pObj->GetObjInventor()==SdrInventor::Default)
+        if (pObj && pObj->GetObjInventor()==SdrInventor::Default)
         {
             sal_uInt16 nIdent=pObj->GetObjIdentifier();
             if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE )