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

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41f4fee00f1cddbf93f7d0ff732b1b41f8d13955
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 15 09:12:30 2017 +0000

    ofz#4647 Integer-overflow
    
    Change-Id: Ic5593df7ad39e591ce15895205a02f2007da4147
    Reviewed-on: https://gerrit.libreoffice.org/46503
    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 db82bf84f21c..c50dd00bc18b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4114,7 +4114,7 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType)
         if (bStartLine || m_bWasTabRowEnd)
         {
             // Call all 64 CRs; not for Header and the like
-            if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT)
+            if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT && l <= nTextLen)
             {
                 if (nTextLen < WW8_CP_MAX/100)
                     m_nProgress = (sal_uInt16)(l * 100 / nTextLen);