core.git: oox/source

[Caolán McNamara (via logerrit)]

 oox/source/vml/vmlshape.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit e6e85bf47b2e62d3af61374eb771a102eb7282fc
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Nov 11 11:13:01 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Nov 12 12:53:38 2024 +0100

    cid#1606989 Overflowed constant
    
    Change-Id: I1165d1c9b145b25e3160b749df9544d653c4920c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176464
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e201a80686af..1f5a8f27c59e 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -208,10 +208,16 @@ awt::Rectangle ShapeType::getAbsRectangle() const
     if (nLeft == 0 && maTypeModel.maPosition == "absolute")
         nLeft = 1;
 
-    return awt::Rectangle(
-        nLeft,
-        ConversionHelper::decodeMeasureToHmm( rGraphicHelper, 
maTypeModel.maTop, 0, false, true ) + ConversionHelper::decodeMeasureToHmm( 
rGraphicHelper, maTypeModel.maMarginTop, 0, false, true ),
-        nWidth, nHeight );
+    sal_Int32 nTop;
+    if 
(o3tl::checked_add<sal_Int32>(ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
 maTypeModel.maTop, 0, false, true),
+                                     
ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maTypeModel.maMarginTop, 
0, false, true),
+                                     nTop))
+    {
+        SAL_WARN("oox", "overflow in addition");
+        nTop = 0;
+    }
+
+    return awt::Rectangle(nLeft, nTop, nWidth, nHeight);
 }
 
 awt::Rectangle ShapeType::getRelRectangle() const