diff options
| author | Justin Luth <justin_luth@sil.org> | 2020-03-17 21:18:41 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2020-03-18 02:49:05 +0100 |
| commit | 81588ff2f0eb55576a5288778be2dfb5b4bc5e81 (patch) | |
| tree | 612ef1c2bd250b2106f9f2cda99b5f8e806f3af4 | |
| parent | 6ac2d66c78d6c080aabfa46157113684c2f3a3b0 (diff) | |
tdf#130746: avoid nullptr dereference
Change-Id: I32979a23caffea844f1c8eac9f408b18f0768b62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90661
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 5585f3f88d2e..a7ffd2c51920 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3452,9 +3452,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 { @@ -3481,7 +3481,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)); |