[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/ww8/pass/hang-1.doc |binary
 sw/source/filter/ww8/ww8par3.cxx    |    5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7c450576817d2b41d6f0a1f2446d29077ddfc555
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 21 17:06:05 2015 +0100

    need to check for after reading and before seeking
    
    seeking resets eof, so the IsEof is always false
    after the first loop
    
    Change-Id: I2e533f3f9c494566aabb947c05258a770e883b1f
    (cherry picked from commit e2e6fa5ad5aaa20a9fa8a6d060d9edd241aefd52)
    Reviewed-on: https://gerrit.libreoffice.org/17272
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/qa/core/data/ww8/pass/hang-1.doc b/sw/qa/core/data/ww8/pass/hang-1.doc
new file mode 100644
index 0000000..8d68bbb
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/hang-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index a21ac05..1e6c84d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1266,15 +1266,14 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
     {
         bOk = false;
 
-        if (rSt.IsEof())
-            break;
-
         WW8LFO aLFO;
         memset(&aLFO, 0, sizeof( aLFO ));
 
         rSt.ReadUInt32( aLFO.nIdLst );
         rSt.SeekRel( 8 );
         rSt.ReadUChar( aLFO.nLfoLvl );
+        if (!rSt.good())
+            break;
         rSt.SeekRel( 3 );
         // soviele Overrides existieren
         if ((nMaxLevel < aLFO.nLfoLvl) || rSt.GetError())