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

[Caolán McNamara (via logerrit)]

 vcl/source/filter/ipict/ipict.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6d4b78f143f8bea59acd9c62a92effbe6dff0bdf
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 2 15:13:16 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 2 21:05:10 2021 +0200

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

diff --git a/vcl/source/filter/ipict/ipict.cxx b/vcl/source/filter/ipict/ipict.cxx
index e441603426f2..bcc61870726e 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -699,13 +699,13 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod)
 
 sal_uInt64 PictReader::ReadAndDrawText()
 {
-    char        nByteLen;
-    sal_uInt32  nLen, nDataLen;
     char        sText[256];
 
-    pPict->ReadChar( nByteLen ); nLen=static_cast<sal_uInt32>(nByteLen)&0x000000ff;
-    nDataLen = nLen + 1;
-    pPict->ReadBytes(&sText, nLen);
+    char nByteLen(0);
+    pPict->ReadChar(nByteLen);
+    sal_uInt32 nLen = static_cast<sal_uInt32>(nByteLen)&0x000000ff;
+    sal_uInt32 nDataLen = nLen + 1;
+    nLen = pPict->ReadBytes(&sText, nLen);
 
     if (IsInvisible( PictDrawingMethod::TEXT )) return nDataLen;
     DrawingMethod( PictDrawingMethod::TEXT );