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

[Caolán McNamara]

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

New commits:
commit 28dfe2d204967debef358b0f0e76cb195e2999a9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 22 09:37:43 2017 +0100

    ofz#3457 Unknown Read
    
    similar to
    
    commit 35bac83ed2b5d48233c653cc7dc4eab5c234f7ac
    Date:   Mon Aug 7 19:24:37 2017 +0100
    
        ofz#2877: crash in SVTB16Short
    
    Change-Id: Idc2ca89647a5e17484effaca49afce349b98f0a3
    Reviewed-on: https://gerrit.libreoffice.org/42625
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ce322e6c0571..d0253338b228 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3544,8 +3544,7 @@ SprmResult WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const
         return SprmResult();
 
     sal_uInt8* pSp = pSprms;
-
-    sal_uInt16 i=0;
+    size_t i = 0;
     while (i + maSprmParser.MinSprmLen() <= nSprmSiz)
     {
         // Sprm found?