[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Caolán McNamara]

 sw/source/core/frmedt/fews.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ed4b4cf298af859c354629e0f88ad87161385175
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 7 16:55:37 2017 +0100

    Resolves: tdf#102286 lets not crash on null pFrame
    
    this is the FlyEmbeddedPrt case
    
    ensure we don't end up with a null pFrame at return time
    
    (cherry picked from commit 5ce387c4812466e6752b434cf0f5a54f98c6a147)
    
    Change-Id: I68ff6f0a36462cffc47d774865e69041c4dd15a8
    Reviewed-on: https://gerrit.libreoffice.org/36279
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index c15266976511..9c1ff08b257e 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -121,12 +121,15 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
 
         case RECT_FLY_PRT_EMBEDDED: bFrame = false;
                                     SAL_FALLTHROUGH;
-        case RECT_FLY_EMBEDDED:     pFrame = xObj.is() ? FindFlyFrame( xObj )
+        case RECT_FLY_EMBEDDED:
+        {
+                                    const SwFrame *pFlyFrame = xObj.is() ? FindFlyFrame(xObj) : nullptr;
+                                    pFrame = pFlyFrame ? pFlyFrame
                                                 : pFrame->IsFlyFrame()
                                                     ? pFrame
                                                     : pFrame->FindFlyFrame();
                                     break;
-
+        }
         case RECT_OUTTABSECTION_PRT:
         case RECT_OUTTABSECTION :   if( pFrame->IsInTab() )
                                         pFrame = pFrame->FindTabFrame();