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

[Miklos Vajna (via logerrit)]

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

New commits:
commit bc4969829fc227064bdf9e46e7e1cf88ff2d7b46
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jun 7 12:54:12 2022 +0200
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Nov 10 01:57:07 2022 +0100

    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/+/135469
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit af666ed27485ea52b2d7ccd68c91e55b15fa419c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142452
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 5a2385e19cf5..faa05b391115 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -313,7 +313,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() );
         }
     }