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

Caolán McNamara caolanm at redhat.com
Fri Nov 3 15:09:15 UTC 2017


 svx/source/table/tablelayouter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bb90e3c28389ec411f6bcd94add4770990bf2f14
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 3 09:15:04 2017 +0000

    ofz#4034 Integer-overflow
    
    Change-Id: Ia126933260ea017f7cfdc8ac2ddc43b16aa37b91
    Reviewed-on: https://gerrit.libreoffice.org/44248
    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/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 4823f6a8ef92..fb01fec34282 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -637,7 +637,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
     while( coliter.next(nCol ) )
     {
         maColumns[nCol].mnPos = nNewWidth;
-        nNewWidth += maColumns[nCol].mnSize;
+        nNewWidth = o3tl::saturating_add(nNewWidth, maColumns[nCol].mnSize);
         if( bFit )
         {
             Reference< XPropertySet > xColSet( xCols->getByIndex(nCol), UNO_QUERY_THROW );


More information about the Libreoffice-commits mailing list