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

need to check for after reading and before seeking

Browse Source 
seeking resets eof, so the IsEof is always false
after the first loop

Change-Id: I2e533f3f9c494566aabb947c05258a770e883b1f
This commit is contained in:
Caolán McNamara
2015-07-21 17:06:05 +01:00
parent abe1788144
commit e2e6fa5ad5
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/core/data/ww8/pass/hang-1.doc Normal file
View File

Binary file not shown.

5
sw/source/filter/ww8/ww8par3.cxx
View File

@@ -1297,15 +1297,14 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
{ {
bOk = false; bOk = false;
if (rSt.IsEof())
break;
WW8LFO aLFO; WW8LFO aLFO;
memset(&aLFO, 0, sizeof( aLFO )); memset(&aLFO, 0, sizeof( aLFO ));
rSt.ReadUInt32( aLFO.nIdLst ); rSt.ReadUInt32( aLFO.nIdLst );
rSt.SeekRel( 8 ); rSt.SeekRel( 8 );
rSt.ReadUChar( aLFO.nLfoLvl ); rSt.ReadUChar( aLFO.nLfoLvl );
if (!rSt.good())
break;
rSt.SeekRel( 3 ); rSt.SeekRel( 3 );
// soviele Overrides existieren // soviele Overrides existieren
if ((nMaxLevel < aLFO.nLfoLvl) || rSt.GetError()) if ((nMaxLevel < aLFO.nLfoLvl) || rSt.GetError())