[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/frmedt/feshview.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28f1385bbc9d18051d2c10fb03dd0ba13e7fb915
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jun 7 12:54:12 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 8 13:43:12 2022 +0200

    sw: fix crash in SwFEShell::SelectObj()
    
    Fatal signal received: SIGSEGV code: 1 for address: 0x0
    
    SwLayoutFrame::Lower() const
            sw/source/core/inc/layfrm.hxx:101
    SwFEShell::SelectObj(Point const&, unsigned char, SdrObject*)
            sw/source/core/frmedt/feshview.cxx:317
    SwEditWin::MouseButtonDown(MouseEvent const&)
            sw/source/uibase/docvw/edtwin.cxx:?
    
    Change-Id: I6c4076eef21dd80381b37ed89aa2dc8bc20fbc98
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135491
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 437acab38f2404886a2b83138eb9eb11c4146a76)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135383
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index e0212c28d57c..eab41d781c7a 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -314,7 +314,7 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 
nFlag, SdrObject *pObj )
         {
             const SwFlyFrame *pTmp = GetFlyFromMarked( &rMrkList, this );
             OSL_ENSURE( pTmp, "Graphic without Fly" );
-            if ( static_cast<const 
SwNoTextFrame*>(pTmp->Lower())->HasAnimation() )
+            if ( pTmp && static_cast<const 
SwNoTextFrame*>(pTmp->Lower())->HasAnimation() )
                 static_cast<const 
SwNoTextFrame*>(pTmp->Lower())->StopAnimation( GetOut() );
         }
     }