[Libreoffice-commits] .: sw/source

[Caolán McNamara]

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

New commits:
commit 7a8fe22857c48a424dd0d947de507de081e39dc7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 8 13:16:49 2011 +0100

    restore CVE fix. unit tests rule

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 077cb24..9c14be0 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3361,7 +3361,7 @@ sal_uInt16 WW8TabDesc::GetLogicalWWCol() const // returns number of col as INDIC
     sal_uInt16 nCol = 0;
     if( pActBand && pActBand->pTCs)
     {
-        for( sal_uInt16 iCol = 1; iCol <= nAktCol; ++iCol )
+        for( sal_uInt16 iCol = 1; iCol <= nAktCol && iCol <= pActBand->nWwCols; ++iCol )
         {
             if( !pActBand->pTCs[ iCol-1 ].bMerged )
                 ++nCol;