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

Caolán McNamara caolanm at redhat.com
Sun Oct 29 10:03:17 UTC 2017


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

New commits:
commit b154334ad14b339a3f29300572bdb78d6a8df15b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 28 17:40:31 2017 +0100

    ofz#3839 Integer-overflow
    
    Change-Id: I79c79bc75443f87cf36ec325c9b4d6b513959a76
    Reviewed-on: https://gerrit.libreoffice.org/44012
    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 c6fbe4009b85..ec3c24a0bed9 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -571,7 +571,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
             if( maColumns[nCol].mnSize < nMinWidth )
                 maColumns[nCol].mnSize = nMinWidth;
 
-            nCurrentWidth += maColumns[nCol].mnSize;
+            nCurrentWidth = o3tl::saturating_add(nCurrentWidth, maColumns[nCol].mnSize);
         }
     }
 


More information about the Libreoffice-commits mailing list