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

[Caolán McNamara (via logerrit)]

 sw/source/ui/misc/pagenumberdlg.cxx |    1 +
 vcl/source/gdi/metaact.cxx          |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0b35b7953507491fe1ebdead9ac6ce592bd9b674
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 27 13:02:36 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 27 16:43:21 2023 +0200

    cid#1528191 Uninitialized scalar field
    
    Change-Id: I0d57f541fb110af295db6b56c32e7ee32168b463
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151097
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/ui/misc/pagenumberdlg.cxx 
b/sw/source/ui/misc/pagenumberdlg.cxx
index 0c6357e7ef99..a4a329f62ca6 100644
--- a/sw/source/ui/misc/pagenumberdlg.cxx
+++ b/sw/source/ui/misc/pagenumberdlg.cxx
@@ -34,6 +34,7 @@ SwPageNumberDlg::SwPageNumberDlg(weld::Window* pParent)
     , m_xPreviewImage(m_xBuilder->weld_image("previewImage"))
     , m_aPageNumberPosition(1) // bottom
     , m_aPageNumberAlignment(1) // center
+    , m_nPageNumberType(SVX_NUM_CHARS_UPPER_LETTER)
 {
     m_xOk->connect_clicked(LINK(this, SwPageNumberDlg, OkHdl));
     m_xPageNumberPosition->connect_changed(LINK(this, SwPageNumberDlg, 
PositionSelectHdl));
commit b9f78bec3558937d45b3a9d730c1c9d40a9c58d6
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 27 13:14:52 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 27 16:43:06 2023 +0200

    ofz#58380 Integer-overflow
    
    Change-Id: I88155f7f2abf42a11376d6f54aab28c233cf7e07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151100
    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 00921c609bca..eab791889ce6 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -925,8 +925,12 @@ static bool AllowScale(const Size& rSource, const Size& 
rDest)
 
 void MetaBmpScaleAction::Execute( OutputDevice* pOut )
 {
-    if (!AllowScale(maBmp.GetSizePixel(), pOut->LogicToPixel(maSz)))
+    Size aPixelSize(pOut->LogicToPixel(maSz));
+    if (!AllowRect(tools::Rectangle(pOut->LogicToPixel(maPt), aPixelSize)) ||
+        !AllowScale(maBmp.GetSizePixel(), aPixelSize))
+    {
         return;
+    }
 
     pOut->DrawBitmap( maPt, maSz, maBmp );
 }