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

[Caolán McNamara]

 svx/source/table/tablelayouter.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc6128d727d1e92b2aa2b4dd9cbae8e045cf1f6b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 2 09:34:10 2017 +0000

    ofz#3886 Integer-overflow
    
    Change-Id: I936f681b835cca62fc14a326b7ae5cb062b3f1df
    Reviewed-on: https://gerrit.libreoffice.org/44197
    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 63ca7b8c1bcc..4823f6a8ef92 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -472,11 +472,11 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu
                     if (nIndex != (nCount-1))
                     {
                         bConstrainsBroken |= o3tl::checked_multiply(nDistribute, rLayout.mnSize, n);
-                        n  /= nCurrentWidth;
+                        n /= nCurrentWidth;
                     }
 
+                    bConstrainsBroken |= o3tl::checked_add(rLayout.mnSize, n, rLayout.mnSize);
                     nDistributed -= n;
-                    rLayout.mnSize += n;
 
                     if( rLayout.mnSize < rLayout.mnMinSize )
                         bConstrainsBroken = true;