svx/source/table/tablelayouter.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3d4a0e5cf5b7dca6a62508521849ac3908c2af05
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Nov 25 15:05:20 2017 +0000
ofz#4422 Integer-overflow
Change-Id: I1f3a09e34253de7f7a221e2c88d61c293cb69d03
Reviewed-on: https://gerrit.libreoffice.org/45271
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 2b150e365456..e0ba76552c61 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -85,7 +85,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellRef&
xCell, const CellPo
if( ((sal_Int32)maRows.size()) <= aPos.mnRow )
break;
- height += maRows[aPos.mnRow++].mnSize;
+ height = o3tl::saturating_add(height,
maRows[aPos.mnRow++].mnSize);
nRowSpan--;
}
@@ -96,7 +96,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellRef&
xCell, const CellPo
if( ((sal_Int32)maColumns.size()) <= aPos.mnCol )
break;
- width += maColumns[aPos.mnCol++].mnSize;
+ width = o3tl::saturating_add(width,
maColumns[aPos.mnCol++].mnSize);
nColSpan--;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
