writerfilter/source/dmapper/DomainMapperTableManager.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3d39dad6d93c979ac64244ecb9acfbd8a5fbd6c6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 11 11:25:54 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 11 13:17:31 2018 +0200
ofz#10228 Integer-overflow
Change-Id: Ifb7e6ad6f5ffe71c3c5bb7cca9cb3b27bff7943a
Reviewed-on: https://gerrit.libreoffice.org/60308
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c473eccaf198..37f07f21a556 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -627,8 +627,8 @@ void DomainMapperTableManager::endOfRowAction()
// a grid of "20:40:20" and it doesn't have to do something with the
tableWidth
// -> so we have get the sum of each grid entry for the fullWidthRelative:
int nFullWidthRelative = 0;
- for (sal_Int32 i : (*pTableGrid.get()))
- nFullWidthRelative += i;
+ for (int i : (*pTableGrid.get()))
+ nFullWidthRelative = o3tl::saturating_add(nFullWidthRelative, i);
if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) &&
m_nCell.back( ) > 0 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
