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

Caolán McNamara caolanm at redhat.com
Wed Nov 1 15:55:57 UTC 2017


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

New commits:
commit 0bc9547ff7ad219ae591b645052152b71cc76f6e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 1 11:28:01 2017 +0000

    ofz#3886 Integer-overflow
    
    Change-Id: I5f7ee16e8b05d7bb7e15ca26e0902ad0c1fed2de
    Reviewed-on: https://gerrit.libreoffice.org/44164
    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 ec3c24a0bed9..63ca7b8c1bcc 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -454,7 +454,7 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu
         {
             Layout& rLayout = rLayouts[nIndex];
             if( (nDistribute > 0) || (rLayout.mnSize > rLayout.mnMinSize) )
-                nCurrentWidth += rLayout.mnSize;
+                nCurrentWidth = o3tl::saturating_add(nCurrentWidth, rLayout.mnSize);
         }
 
         bConstrainsBroken = false;


More information about the Libreoffice-commits mailing list