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

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f2dcce9155ddd9444f65b26c59c3b873ac603091
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 8 16:09:36 2016 +0100

    Resolves: tdf#100813 crash during pagination of particular docx
    
    Change-Id: Id2c99cc6c5fe4c3a5bcf3c0b3f16b603cdd46239
    (cherry picked from commit f374e01af32c7752b31455642e7d76f2056a2aeb)
    Reviewed-on: https://gerrit.libreoffice.org/27051
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 850fc4e303..8420956 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2010,6 +2010,9 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
     }
 
     SwFootnoteBossFrame * pOldBoss = m_rThis.FindFootnoteBossFrame();
+    if (!pOldBoss)
+        return false;
+
     SwPageFrame * const pOldPage = pOldBoss->FindPageFrame();
     SwLayoutFrame *pNewUpper = nullptr;
     bool bCheckPageDescs = false;