diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-17 09:08:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-17 12:11:42 +0200 |
| commit | a5cd6eb9efadc3d0ca2648acdc96e780bda8ad20 (patch) | |
| tree | f23e20f24fd88ed566cd936e5638d3abf54f3405 /lotuswordpro | |
| parent | 335036f0d05bdfde49cacf245863c686d07a2d5f (diff) | |
ofz#7729 Null-dereference READ
Change-Id: I223f4f7fd622822b42d8e7cb342d451c54d6dcbd
Reviewed-on: https://gerrit.libreoffice.org/53017
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/lwptablelayout.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 379c44b34c13..ff4b7f65a6f9 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -543,8 +543,13 @@ OUString LwpTableLayout::GetColumnWidth(sal_uInt16 nCol) */ void LwpTableLayout::RegisterColumns() { - LwpTable * pTable = GetTable(); - LwpSuperTableLayout * pSuper = GetSuperTableLayout(); + LwpTable* pTable = GetTable(); + if (!pTable) + throw std::range_error("corrupt LwpTableLayout"); + + LwpSuperTableLayout* pSuper = GetSuperTableLayout(); + if (!pSuper) + throw std::range_error("corrupt LwpTableLayout"); sal_uInt16 nCols = m_nCols; @@ -556,9 +561,6 @@ void LwpTableLayout::RegisterColumns() m_aColumns[i] = nullptr; } - if (!pTable) - throw std::range_error("corrupt LwpTableLayout"); - double dDefaultColumn = pTable->GetWidth(); sal_uInt16 nJustifiableColumn = nCols; |