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

[Libreoffice Gerrit user]

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

New commits:
commit 577d4f115fd607d36ad574872f187b7c08223ace
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 7 09:03:26 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 7 12:58:49 2018 +0100

    ofz#11274 integer-overflow
    
    Change-Id: I826088ed85f2503e41315aacc72947a41dc9cd26
    Reviewed-on: https://gerrit.libreoffice.org/62992
    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 076a0f6ed40a..4012f2fa429a 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -825,7 +825,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
             }
         }
         if( bChanges )
-            nCurrentHeight += maRows[nRow].mnSize - nOldSize;
+            nCurrentHeight = o3tl::saturating_add(nCurrentHeight, maRows[nRow].mnSize - nOldSize);
     }
 
     // now scale if wanted and needed