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

[Caolán McNamara (via logerrit)]

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

New commits:
commit aa9e05236b73067e34d34d9861fc394ba854399b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 2 15:07:53 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 3 16:09:27 2021 +0200

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

diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index 6665d09daa41..296be1dc1def 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -256,7 +256,7 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& 
rHeader, bool& bTopDown
             return false;
     }
 
-    if (rHeader.nHeight == SAL_MIN_INT32)
+    if (!rIStm.good() || rHeader.nHeight == SAL_MIN_INT32)
         return false;
 
     if ( rHeader.nHeight < 0 )