strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ofz: infinite loop

Browse source 
Change-Id: I2230a3fdd602063e66f56d23c15f79d6d4de4c8a
Reviewed-on: https://gerrit.libreoffice.org/50000
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-02-19 14:40:15 +00:00
parent 3668960d94
commit 1404b82e8d
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lotuswordpro/source/filter/lwptablelayout.cxx
View file

@ -451,8 +451,11 @@ void LwpTableLayout::TraverseTable()
// set value
LwpObjectID& rRowID = GetChildHead();
LwpRowLayout * pRowLayout = dynamic_cast<LwpRowLayout *>(rRowID.obj().get());
std::set<LwpRowLayout*> aSeen;
while (pRowLayout)
{
aSeen.insert(pRowLayout);
pRowLayout->SetRowMap();
// for 's analysis job
@ -462,6 +465,8 @@ void LwpTableLayout::TraverseTable()
rRowID = pRowLayout->GetNext();
pRowLayout = dynamic_cast<LwpRowLayout *>(rRowID.obj().get());
if (aSeen.find(pRowLayout) != aSeen.end())
throw std::runtime_error("loop in conversion");
}
}
@ -563,8 +568,11 @@ void LwpTableLayout::RegisterColumns()
// NOTICE: all default columns are regarded as justifiable columns
LwpObjectID& rColumnID = GetColumnLayoutHead();
LwpColumnLayout * pColumnLayout = dynamic_cast<LwpColumnLayout *>(rColumnID.obj().get());
std::set<LwpColumnLayout*> aSeen;
while (pColumnLayout)
{
aSeen.insert(pColumnLayout);
auto nColId = pColumnLayout->GetColumnID();
if (nColId >= nCols)
{
@ -580,6 +588,9 @@ void LwpTableLayout::RegisterColumns()
rColumnID = pColumnLayout->GetNext();
pColumnLayout = dynamic_cast<LwpColumnLayout *>(rColumnID.obj().get());
if (aSeen.find(pColumnLayout) != aSeen.end())
throw std::runtime_error("loop in conversion");
}
// if all columns are not justifiable, the rightmost column will be changed to justifiable