summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-22 15:54:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-03-23 09:50:49 +0100
commit3c8a6b0a183e5fa78024b5e0bb83584269068c3e (patch)
tree7d9a7296861abdb23966d04f213cf6c56271dea1
parentd47c84a5fd38c1aa28fe6e3144b4efd0226f8f97 (diff)
ofz#7065 Integer-overflow
Change-Id: Ic8837d21d64dc6fd3623ab5d32bc902e6c34dd21 Reviewed-on: https://gerrit.libreoffice.org/51746 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svx/source/table/tablemodel.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 224d6280b4a1..033af2477a45 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1028,7 +1028,7 @@ void TableModel::optimize()
Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maRows[nRow-1].get() ), UNO_QUERY_THROW );
xSet1->getPropertyValue( sHeight ) >>= nHeight1;
xSet2->getPropertyValue( sHeight ) >>= nHeight2;
- nHeight1 += nHeight2;
+ nHeight1 = o3tl::saturating_add(nHeight1, nHeight2);
xSet2->setPropertyValue( sHeight, Any( nHeight1 ) );
}
catch( Exception& )