sw/source/core/layout/ftnfrm.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3782a36382af0609aed73caa8334b6f1c55dc93c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 23 10:31:29 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 23 21:08:21 2019 +0200
crashtesting: failure on
swfootnoteframe_colunlock_heap_use_after_free.sample
Change-Id: I4ea9c274c1f3548f132ead290efefc1a7972e5c7
Reviewed-on: https://gerrit.libreoffice.org/76152
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 4560ded12942..89f52716e4f0 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2269,7 +2269,7 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const
SwTwips nDeadLine, const boo
*(pCnt->FindPageFrame()) ) )
{
// restart format with first content
- pCnt = pFootnote->ContainsAny();
+ pCnt = pFootnote ? pFootnote->ContainsAny() :
nullptr;
if (!pCnt)
bMore = false;
continue;
@@ -2287,6 +2287,8 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const
SwTwips nDeadLine, const boo
pLastFootnoteFrame = nullptr;
pFootnoteFrame->Cut();
SwFrame::DestroyFrame(pFootnoteFrame);
+ if (pFootnote == pFootnoteFrame)
+ pFootnote = nullptr;
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
