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

ofz#969 endless loop in ppt loading

Browse Source 
Change-Id: If68bf21cd135c64957cc6def654230daa5240698
This commit is contained in:
Caolán McNamara
2017-03-30 14:02:51 +01:00
parent 0cd7ccb87e
commit 0d658dfc8f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
filter/source/msfilter/svdfppt.cxx
View File

@@ -1380,14 +1380,14 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
if ( aPersistHd.nRecType == PPT_PST_PersistPtrIncrementalBlock ) if ( aPersistHd.nRecType == PPT_PST_PersistPtrIncrementalBlock )
{ {
sal_uLong nPibLen = aPersistHd.GetRecEndFilePos(); sal_uLong nPibLen = aPersistHd.GetRecEndFilePos();
while ( bOk && ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPibLen ) ) while (bOk && rStCtrl.good() && (rStCtrl.Tell() < nPibLen))
{ {
sal_uInt32 nOfs(0); sal_uInt32 nOfs(0);
rStCtrl.ReadUInt32( nOfs ); rStCtrl.ReadUInt32( nOfs );
sal_uInt32 nAnz = nOfs; sal_uInt32 nAnz = nOfs;
nOfs &= 0x000FFFFF; nOfs &= 0x000FFFFF;
nAnz >>= 20; nAnz >>= 20;
while ( bOk && ( rStCtrl.GetError() == 0 ) && ( nAnz > 0 ) && ( nOfs <= nPersistPtrAnz ) ) while (bOk && rStCtrl.good() && (nAnz > 0) && (nOfs <= nPersistPtrAnz))
{ {
sal_uInt32 nPt(0); sal_uInt32 nPt(0);
rStCtrl.ReadUInt32( nPt ); rStCtrl.ReadUInt32( nPt );