ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

ofz#7729 Null-dereference READ

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2018-04-17 12:11:42 +02:00
parent 335036f0d0
commit a5cd6eb9ef
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lotuswordpro/source/filter/lwptablelayout.cxx
+7 -5
View File
@@ -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;