[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/iras/iras.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9841853b8a4b4cac06f59269189f50f3f73d79ab
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 23 20:03:26 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Aug 25 10:02:51 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: I4e592de5ff830aa970b96993c79a5d957f57adfc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120922
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit fe90f7fc34f8a6e354abbb48c21556d018fa768d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120977
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/vcl/source/filter/iras/iras.cxx b/vcl/source/filter/iras/iras.cxx
index 128255fed025..49cfe2bef2cc 100644
--- a/vcl/source/filter/iras/iras.cxx
+++ b/vcl/source/filter/iras/iras.cxx
@@ -94,7 +94,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 
     m_rRAS.SetEndian( SvStreamEndian::BIG );
     m_rRAS.ReadUInt32( nMagicNumber );
-    if ( nMagicNumber != SUNRASTER_MAGICNUMBER )
+    if (!m_rRAS.good() || nMagicNumber != SUNRASTER_MAGICNUMBER)
         return false;
 
     // Kopf einlesen: