Skip to content

C
core
Kaydet (Commit) 452cd9e7 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

check stream status 

Change-Id: I6b9537cf94ac1c5d996ba64ddf878745dadde254
üst 723b3278
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
sd/source/filter/ppt/propread.cxx
Dosyayı görüntüle @ 452cd9e7
...@@ -497,10 +497,18 @@ void Section::Read( SotStorageStream *pStrm ) ...@@ -497,10 +497,18 @@ void Section::Read( SotStorageStream *pStrm )
{ {
sal_uInt32 nDictCount(0); sal_uInt32 nDictCount(0);
pStrm->ReadUInt32(nDictCount); pStrm->ReadUInt32(nDictCount);
auto nMaxRecordsPossible = pStrm->remainingSize() / (sizeof(sal_uInt32)*2);
if (nDictCount > nMaxRecordsPossible)
{
SAL_WARN("sd.filter", "Dictionary count of " << nDictCount << " claimed, only " << nMaxRecordsPossible << " possible");
nDictCount = nMaxRecordsPossible;
}
for (sal_uInt32 i = 0; i < nDictCount; ++i) for (sal_uInt32 i = 0; i < nDictCount; ++i)
{ {
sal_uInt32 nSize(0); sal_uInt32 nSize(0);
pStrm->ReadUInt32( nSize ).ReadUInt32( nSize ); pStrm->ReadUInt32( nSize ).ReadUInt32( nSize );
if (!pStrm->good())
break;
sal_uInt64 nPos = pStrm->Tell() + nSize; sal_uInt64 nPos = pStrm->Tell() + nSize;
if (nPos != pStrm->Seek(nPos)) if (nPos != pStrm->Seek(nPos))
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment