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

Caolán McNamara caolanm at redhat.com
Tue Nov 28 14:13:12 UTC 2017


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

New commits:
commit 52869df3f080aae37a1a6fa24e3bd6404ed67646
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 28 10:02:28 2017 +0000

    ofz#4461 Integer-overflow
    
    Change-Id: Iae41823164c09352ef8ffa97dc3361476c03add8
    Reviewed-on: https://gerrit.libreoffice.org/45396
    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 e0ba76552c61..d1de33c1b464 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -805,7 +805,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
     for( nRow = 0; nRow < nRowCount; ++nRow )
     {
         maRows[nRow].mnPos = nNewHeight;
-        nNewHeight += maRows[nRow].mnSize;
+        nNewHeight = o3tl::saturating_add(nNewHeight, maRows[nRow].mnSize);
 
         if( bFit )
         {


More information about the Libreoffice-commits mailing list