Attachment 158791 Details for Bug 124300 – tdf124300_gpf_fix.patch: changes GPF into an infinite loop

[patch] tdf124300_gpf_fix.patch: changes GPF into an infinite loop

tdf124300_gpf_fix.patch (text/plain), 1.38 KB, created by Justin L on 2020-03-19 06:36:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin L

Created: 2020-03-19 06:36:09 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
>index 0431934534f4..81699eb29d43 100644
>--- a/sw/source/core/layout/ftnfrm.cxx
>+++ b/sw/source/core/layout/ftnfrm.cxx
>@@ -1102,7 +1102,8 @@ SwFootnoteFrame *SwFootnoteBossFrame::FindFirstFootnote()
>             if ( pCont )
>                 pNxt = static_cast<SwFootnoteFrame*>(pCont->Lower());
>         }
>-        if ( pNxt )
>+
>+        if ( pNxt && pNxt->GetRef() )
>         {
>             pRet = pNxt;
>             pBoss = pRet->GetRef()->FindFootnoteBossFrame();
>@@ -1147,10 +1148,11 @@ const SwFootnoteFrame *SwFootnoteBossFrame::FindFirstFootnote( SwContentFrame co
>                 SwFootnoteContFrame *pCont = pBoss ? pBoss->FindNearestFootnoteCont() : nullptr;
>                 pRet = pCont ? static_cast<SwFootnoteFrame*>(pCont->Lower()) : nullptr;
>             }
>+SAL_WARN("DEBUG","::FindFirstFootnote pRet["<<pRet<<"] Ref["<<(pRet && pRet->GetRef())<<"] footnoteboss["<<(pRet && pRet->GetRef() && pRet->GetRef()->FindFootnoteBossFrame())<<"]");
>             if ( pRet )
>             {
>                 const SwFootnoteBossFrame* pBoss = pRet->GetRef()->FindFootnoteBossFrame();
>-                if( pBoss->GetPhyPageNum() != nPageNum ||
>+                if( !pBoss || pBoss->GetPhyPageNum() != nPageNum ||
>                     nColNum != lcl_ColumnNum( pBoss ) )
>                     pRet = nullptr;
>             }

Actions: View

Attachments on bug 124300: 150239 | 158791 | 180180 | 180181