mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz: infinite loop

Browse Source 
Change-Id: Ie42e73ebe02cd4c2bb10c9d0e55a5256b1fffd15
Reviewed-on: https://gerrit.libreoffice.org/59248
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-08-17 09:15:02 +01:00
parent b83fac898a
commit c05692cbcd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lotuswordpro/source/filter/lwpdoc.cxx
View File

@@ -651,13 +651,16 @@ LwpDocument* LwpDocument::GetLastDivisionWithContents()
return this; return this;
LwpDocument* pDivision = GetFirstDivision(); LwpDocument* pDivision = GetFirstDivision();
std::set<LwpDocument*> aSeen;
while (pDivision) while (pDivision)
{ {
aSeen.insert(pDivision);
LwpDocument* pContentDivision = pDivision->GetFirstDivisionWithContentsThatIsNotOLE(); LwpDocument* pContentDivision = pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
if(pContentDivision) if (pContentDivision)
return pContentDivision; return pContentDivision;
pDivision = pDivision->GetNextDivision(); pDivision = pDivision->GetNextDivision();
if (aSeen.find(pDivision) != aSeen.end())
throw std::runtime_error("loop in conversion");
} }
return nullptr; return nullptr;
} }