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

[Caolán McNamara]

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

New commits:
commit 2671816be19e541941b9b3cbd3f085ea3748261d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 19 10:47:56 2017 +0000

    Related: tdf#100813 don't crash traversing table in page 43
    
    master has...
    
    commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb
    Author: Mike Kaganski <mike.kaganski at collabora.com>
    Date:   Wed Jan 18 09:25:55 2017 +0300
    
        tdf#104181 related: don't throw on this document
    
    which is more extreme, keep it minimal for the backport,
    MoveFootnoteCntFwd always derefs pOldBoss so check for null
    before calling into it here
    
    Change-Id: I726095567e4101170f2bf9244efbf8960cc39380
    Reviewed-on: https://gerrit.libreoffice.org/33305
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index c48029a..02bed5f 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1799,7 +1799,7 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
     SwFootnoteBossFrame *pOldBoss = m_rThis.FindFootnoteBossFrame();
     if (m_rThis.IsInFootnote())
     {
-        if (!m_rThis.IsContentFrame())
+        if (!m_rThis.IsContentFrame() || !pOldBoss)
         {
             SAL_WARN("sw.core", "Tables in footnotes are not truly supported");
             return false;