commit 5ce387c4812466e6752b434cf0f5a54f98c6a147
author Caolán McNamara <caolanm@redhat.com> Fri Apr 07 16:55:37 2017 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri Apr 07 18:37:01 2017 +0100
tree 0c4ab4845ce5b9585438d27055c003dfbcb6a41d
parent a7d008a8dfdc0a8b42061329b5e756b1b034abaf

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

Change-Id: I68ff6f0a36462cffc47d774865e69041c4dd15a8

sw/source/core/frmedt/fews.cxx

diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 473c324..44384a5 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -125,12 +125,14 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
                                    bFrame = false;
                                    SAL_FALLTHROUGH;
        case CurRectType::FlyEmbedded:
                                    pFrame = xObj.is() ? FindFlyFrame( xObj )
        {
                                    const SwFrame *pFlyFrame = xObj.is() ? FindFlyFrame(xObj) : nullptr;
                                    pFrame = pFlyFrame ? pFlyFrame
                                                : pFrame->IsFlyFrame()
                                                    ? pFrame
                                                    : pFrame->FindFlyFrame();
                                    break;

        }
        case CurRectType::SectionOutsideTable :
                                    if( pFrame->IsInTab() )
                                        pFrame = pFrame->FindTabFrame();