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

[Libreoffice Gerrit user]

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

New commits:
commit e41667762bfff43f95d1ee71b2d67903e4fdab4e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 21 08:58:49 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 21 11:29:23 2018 +0100

    ofz#11472 Integer-overflow
    
    Change-Id: I4776e416071e94468868847420c17d752d39c081
    Reviewed-on: https://gerrit.libreoffice.org/63695
    Tested-by: Jenkins
    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 5560d86e57e0..c9a8961eddab 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -664,7 +664,9 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
         }
 
         if( bChanges )
-            nCurrentWidth += maColumns[nCol].mnSize - nOldSize;
+        {
+            nCurrentWidth = o3tl::saturating_add(nCurrentWidth, maColumns[nCol].mnSize - nOldSize);
+        }
     }
 
     // now scale if wanted and needed