[Libreoffice-commits] core.git: 2 commits - editeng/source vcl/source

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/editeng.cxx |    5 +++++
 vcl/source/gdi/metaact.cxx         |    7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit ea7db3b0828f16d424910892f10a3b979dbf2ed3
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 19 10:33:18 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Dec 19 15:36:38 2022 +0000

    ofz#54240 Integer-overflow
    
    Change-Id: I50c8f9579a9fb07431ad0d6eebc5f0df8e40ebd4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144463
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 88f3da979c88..c3d1d11b9a4c 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -591,7 +591,7 @@ static bool AllowRect(const tools::Rectangle& rRect)
 
 void MetaTextAction::Execute( OutputDevice* pOut )
 {
-    if (!AllowY(maPt.Y()))
+    if (!AllowY(pOut->LogicToPixel(maPt).Y()))
         return;
 
     pOut->DrawText( maPt, maStr, mnIndex, mnLen );
@@ -724,6 +724,9 @@ MetaStretchTextAction::MetaStretchTextAction( const Point& 
rPt, sal_uInt32 nWidt
 
 void MetaStretchTextAction::Execute( OutputDevice* pOut )
 {
+    if (!AllowY(pOut->LogicToPixel(maPt).Y()))
+        return;
+
     pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen );
 }
 
@@ -760,7 +763,7 @@ MetaTextRectAction::MetaTextRectAction( const 
tools::Rectangle& rRect,
 
 void MetaTextRectAction::Execute( OutputDevice* pOut )
 {
-    if (!AllowRect(maRect))
+    if (!AllowRect(pOut->LogicToPixel(maRect)))
         return;
 
     pOut->DrawText( maRect, maStr, mnStyle );
commit 24c48fbcb845844aa93799a0e536e4b6d1ea9b8b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 19 10:21:03 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Dec 19 15:36:29 2022 +0000

    ofz: bad-casts at shutdown
    
    Change-Id: Ia8cdf5d446647e0f3d60c14e1aae315db63769c7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144462
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index c8a66d0470a4..32fad4d8fc35 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2625,9 +2625,14 @@ SfxItemPool& EditEngine::GetGlobalItemPool()
     if ( !pGlobalPool )
     {
         pGlobalPool = CreatePool();
+#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
+        // TerminateListener option not available, force it to leak
+        pGlobalPool->acquire();
+#else
         uno::Reference< frame::XDesktop2 > xDesktop = 
frame::Desktop::create(comphelper::getProcessComponentContext());
         uno::Reference< frame::XTerminateListener > xListener( new 
TerminateListener );
         xDesktop->addTerminateListener( xListener );
+#endif
     }
     return *pGlobalPool;
 }