core.git: 2 commits - emfio/source vcl/source

[Caolán McNamara (via logerrit)]

 emfio/source/reader/mtftools.cxx |    4 ++--
 vcl/source/gdi/metaact.cxx       |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a401e72370133403f81492c31bdc45bddaba6d49
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 4 15:26:54 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 4 20:29:32 2024 +0200

    ofz#68504 Integer-overflow
    
    Change-Id: I38a5f6550e57875cea3d667a650e165b9d606fbe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167131
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index b6971d7c8bda..becd359ac610 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -411,6 +411,9 @@ MetaPieAction::MetaPieAction( const tools::Rectangle& rRect,
 
 void MetaPieAction::Execute( OutputDevice* pOut )
 {
+    if (!AllowRect(pOut->LogicToPixel(maRect)))
+        return;
+
     pOut->DrawPie( maRect, maStartPt, maEndPt );
 }
 
commit 84811847cf104a236ad505b2ce262e0b30bbaca3
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 4 15:24:00 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 4 20:29:24 2024 +0200

    ofz#68612 Integer-overflow
    
    Change-Id: Ie68a11300f7d2c3667a1d5702cad8e78e6a6c35a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167130
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 93dbea41ba99..940716acd088 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -1753,8 +1753,8 @@ namespace emfio
             // check whether there is a font rotation applied via 
transformation
             Point aP1( ImplMap( Point() ) );
             Point aP2( ImplMap( Point( 0, 100 ) ) );
-            aP2.AdjustX( -(aP1.X()) );
-            aP2.AdjustY( -(aP1.Y()) );
+            aP2.setX(o3tl::saturating_sub(aP2.X(), aP1.X()));
+            aP2.setY(o3tl::saturating_sub(aP2.Y(), aP1.Y()));
             double fX = aP2.X();
             double fY = aP2.Y();
             if ( fX )