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

[Caolán McNamara]

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

New commits:
commit e977aad341f167347967046f5a884ba593ff2153
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 24 15:36:35 2017 +0000

    ofz#4414 set new nWwCols after verifying legal size
    
    otherwise we're returning early with the now wrong
    nWwCols
    
    Change-Id: I2031c23ca24241fb4946b5a5a62eabc27c2bdcc2
    Reviewed-on: https://gerrit.libreoffice.org/45241
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b65b763b73b1..225f124bbfb7 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1244,13 +1244,13 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen)
     if (nCols > MAX_COL)
         return;
 
-    short nOldCols = nWwCols;
-    nWwCols = nCols;
-
     nLen -= 2 * (nCols + 1); //reduce len by claimed amount of next x-borders arguments
     if (nLen < 0)
         return;
 
+    short nOldCols = nWwCols;
+    nWwCols = nCols;
+
     const sal_uInt8* pT = &pS[1];
     for (int i = 0; i <= nCols; i++, pT+=2)
         nCenter[i] = (sal_Int16)SVBT16ToShort( pT );    // X-borders