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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 5fa8ee4650962bf483b6ac034dd373b5d7b9926e
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 6 12:41:16 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 6 20:45:25 2021 +0200

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

diff --git a/vcl/source/filter/imet/ios2met.cxx 
b/vcl/source/filter/imet/ios2met.cxx
index edf0bb95293f..5611da89428d 100644
--- a/vcl/source/filter/imet/ios2met.cxx
+++ b/vcl/source/filter/imet/ios2met.cxx
@@ -1837,7 +1837,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
         case GOrdSXtCol: {
             sal_uInt16 nVal;
             if (nOrderID==GOrdPColor || nOrderID==GOrdSColor) {
-                sal_uInt8 nbyte;
+                sal_uInt8 nbyte(0);
                 pOS2MET->ReadUChar( nbyte ); 
nVal=static_cast<sal_uInt16>(nbyte)|0xff00;
             }
             else pOS2MET->ReadUInt16( nVal );
@@ -1992,7 +1992,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
         case GOrdPLnWdt: PushAttr(nOrderID);
             [[fallthrough]];
         case GOrdSLnWdt: {
-            sal_uInt8 nbyte;
+            sal_uInt8 nbyte(0);
             pOS2MET->ReadUChar( nbyte );
             if (nbyte==0) aAttr.nLinWidth=aDefAttr.nLinWidth;
             else aAttr.nLinWidth=static_cast<sal_uInt16>(nbyte)-1;
@@ -2035,7 +2035,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
         case GOrdPChSet: PushAttr(nOrderID);
             [[fallthrough]];
         case GOrdSChSet: {
-            sal_uInt8 nbyte; pOS2MET->ReadUChar( nbyte );
+            sal_uInt8 nbyte(0);
+            pOS2MET->ReadUChar( nbyte );
             aAttr.nChrSet=static_cast<sal_uInt32>(nbyte)&0xff;
             break;
         }
@@ -2107,7 +2108,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
         case GOrdPMkSet: PushAttr(nOrderID);
             [[fallthrough]];
         case GOrdSMkSet: {
-            sal_uInt8 nbyte;
+            sal_uInt8 nbyte(0);
             pOS2MET->ReadUChar( nbyte );
             if (nbyte==0) aAttr.nMrkSet=aDefAttr.nMrkSet;
             else aAttr.nMrkSet=nbyte;
@@ -2117,7 +2118,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
         case GOrdPMkSym: PushAttr(nOrderID);
             [[fallthrough]];
         case GOrdSMkSym: {
-            sal_uInt8 nbyte;
+            sal_uInt8 nbyte(0);
             pOS2MET->ReadUChar( nbyte );
             if (nbyte==0) aAttr.nMrkSymbol=aDefAttr.nMrkSymbol;
             else aAttr.nMrkSymbol=nbyte;
@@ -2132,7 +2133,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
             aAttr.aMrkCellSize.setHeight(ReadCoord(bCoord32) );
             if (bCoord32) nLen-=8; else nLen-=4;
             if (nLen>=2) {
-                sal_uInt8 nbyte;
+                sal_uInt8 nbyte(0);
                 pOS2MET->ReadUChar( nbyte );
                 if ((nbyte&0x80)==0 && aAttr.aMrkCellSize==Size(0,0))
                     aAttr.aMrkCellSize=aDefAttr.aMrkCellSize;