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

[Caolán McNamara (via logerrit)]

 vcl/source/filter/imet/ios2met.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 650773993529aee030a0161d131a361e8e9ab227
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Sep 11 11:51:28 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Sep 11 14:35:15 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: Idf446aaa9b29f61168e29f76382f6258d1b78276
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121936
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/filter/imet/ios2met.cxx b/vcl/source/filter/imet/ios2met.cxx
index a57267357f21..a9c7a2cdde96 100644
--- a/vcl/source/filter/imet/ios2met.cxx
+++ b/vcl/source/filter/imet/ios2met.cxx
@@ -993,20 +993,17 @@ void OS2METReader::ReadBox(bool bGivenPos)
 
 void OS2METReader::ReadBitBlt()
 {
-    Point aP1,aP2;
-    Size aSize;
-    sal_uInt32 nID;
-    OSBitmap * pB;
-
     pOS2MET->SeekRel(4);
+    sal_uInt32 nID(0);
     pOS2MET->ReadUInt32( nID );
     pOS2MET->SeekRel(4);
-    aP1=ReadPoint(); aP2=ReadPoint();
+    Point aP1 = ReadPoint();
+    Point aP2 = ReadPoint();
     if (aP1.X() > aP2.X()) { auto nt=aP1.X(); aP1.setX(aP2.X() ); aP2.setX(nt ); }
     if (aP1.Y() > aP2.Y()) { auto nt=aP1.Y(); aP1.setY(aP2.Y() ); aP2.setY(nt ); }
-    aSize=Size(aP2.X()-aP1.X(),aP2.Y()-aP1.Y());
+    Size aSize(aP2.X() - aP1.X(), aP2.Y() - aP1.Y());
 
-    pB=pBitmapList;
+    OSBitmap* pB = pBitmapList;
     while (pB!=nullptr && pB->nID!=nID) pB=pB->pSucc;
     if (pB!=nullptr) {
         SetRasterOp(aAttr.ePatMix);