[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 722161e26437b25adc449f773836d369bd0cb081
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 23 21:33:49 2017 +0100

    ofz#3005 avoid timeout
    
    Change-Id: Ie06504957dab6a5035c7fa3c9313f316303c4eb8
    Reviewed-on: https://gerrit.libreoffice.org/42700
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f1b2ef2d9e28..c63cb2502269 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4749,10 +4749,10 @@ void SwWW8ImplReader::ReadDocInfo()
             }
             else if (m_xWwFib->m_lcbSttbfAssoc) // not a template, and has a SttbfAssoc
             {
-                long nCur = m_pTableStream->Tell();
+                auto nCur = m_pTableStream->Tell();
                 Sttb aSttb;
-                m_pTableStream->Seek(m_xWwFib->m_fcSttbfAssoc); // point at tgc record
-                if (!aSttb.Read( *m_pTableStream ) )
+                // point at tgc record
+                if (!checkSeek(*m_pTableStream, m_xWwFib->m_fcSttbfAssoc) || !aSttb.Read(*m_pTableStream))
                     SAL_WARN("sw.ww8", "** Read of SttbAssoc data failed!!!! ");
                 m_pTableStream->Seek( nCur ); // return to previous position, is that necessary?
 #if OSL_DEBUG_LEVEL > 1