diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-07-23 10:31:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-23 21:08:21 +0200 |
| commit | 3782a36382af0609aed73caa8334b6f1c55dc93c (patch) | |
| tree | 7e960b0813dfdae62352ff6be1ece44d2a71d4f5 | |
| parent | 3fe1049acee148c7bf7669ef9a6d39f319230c0b (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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; } } } |