diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 10:47:56 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-19 15:42:34 +0000 |
| commit | 2671816be19e541941b9b3cbd3f085ea3748261d (patch) | |
| tree | a8f766603e1c1bf2bfe98cebc1139068b9118128 | |
| parent | 4fd0f5715efb435160814e8c5f514b9ad1752c49 (diff) | |
Related: tdf#100813 don't crash traversing table in page 43
master has...
commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb
Author: Mike Kaganski <mike.kaganski@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@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c48029a3244f..02bed5f77dfa 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; |