sw/source/core/layout/frmtool.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit e73871e273c815461626782b2b055c946c6042d2 Author: Justin Luth <[email protected]> AuthorDate: Tue Mar 17 21:18:41 2020 +0300 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 23 14:13:38 2020 +0100 tdf#130746: avoid nullptr dereference Change-Id: I32979a23caffea844f1c8eac9f408b18f0768b62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90661 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> (cherry picked from commit 81588ff2f0eb55576a5288778be2dfb5b4bc5e81) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90632 Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 0cad5caca44a..eafc4fd48a49 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3451,9 +3451,9 @@ bool IsFrameInSameContext( const SwFrame *pInnerFrame, const SwFrame *pFrame ) static SwTwips lcl_CalcCellRstHeight( SwLayoutFrame *pCell ) { - if ( pCell->Lower()->IsContentFrame() || pCell->Lower()->IsSctFrame() ) + SwFrame *pLow = pCell->Lower(); + if ( pLow && (pLow->IsContentFrame() || pLow->IsSctFrame()) ) { - SwFrame *pLow = pCell->Lower(); long nHeight = 0, nFlyAdd = 0; do { @@ -3480,7 +3480,6 @@ static SwTwips lcl_CalcCellRstHeight( SwLayoutFrame *pCell ) else { long nRstHeight = 0; - SwFrame *pLow = pCell->Lower(); while (pLow && pLow->IsLayoutFrame()) { nRstHeight += ::CalcRowRstHeight(static_cast<SwLayoutFrame*>(pLow)); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
