[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2ec31453aba32d8b768be239a7c983397a7d0f6b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 24 09:37:11 2015 +0100

    dismiss bad seek offsets early
    
    Change-Id: Ia88bc1833d362547f45e073028203a4de581f3e2
    (cherry picked from commit 8657e3795d2e0ef0653835e2d56c53512dd43aea)
    Reviewed-on: https://gerrit.libreoffice.org/17945
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 857e4e2..496e81a 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7558,7 +7558,8 @@ SEPr::SEPr() :
 
 bool checkSeek(SvStream &rSt, sal_uInt32 nOffset)
 {
-    return (rSt.Seek(nOffset) == static_cast<sal_Size>(nOffset));
+    return (nOffset != SAL_MAX_UINT32 &&
+            rSt.Seek(nOffset) == static_cast<sal_Size>(nOffset));
 }
 
 bool checkRead(SvStream &rSt, void *pDest, sal_uInt32 nLength)