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

Caolán McNamara caolanm at redhat.com
Thu Nov 9 17:00:01 UTC 2017


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

New commits:
commit 7586246f61df80bcb27b279a39fb9541d96eab67
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 9 11:11:17 2017 +0000

    ofz#4146 Integer-overflow
    
    Change-Id: I380315539f06e790a023b6ac4c4733c136c1c180
    Reviewed-on: https://gerrit.libreoffice.org/44544
    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 81d05ffb4cfb..b71966da33a9 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -739,7 +739,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
             if( maRows[nRow].mnSize < nMinHeight )
                 maRows[nRow].mnSize = nMinHeight;
 
-            nCurrentHeight += maRows[nRow].mnSize;
+            nCurrentHeight = o3tl::saturating_add(nCurrentHeight, maRows[nRow].mnSize);
         }
     }
 


More information about the Libreoffice-commits mailing list