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

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/svmconverter.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 33c1ba1209c7ce679889270edbf42fa66b317895
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 23 17:40:23 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 24 09:34:01 2021 +0200

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

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 8981ceb56fdc..126807b8f691 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -294,8 +294,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
     // check header-magic and version
     if( rIStm.GetError()
-        || ( memcmp( aCode, "SVGDI", sizeof( aCode ) ) != 0 )
-        || ( nVersion != 200 ) )
+        || ( nVersion != 200 )
+        || ( memcmp( aCode, "SVGDI", sizeof( aCode ) ) != 0 ) )
     {
         SAL_WARN("vcl.gdi", "svm: wrong check for header-magic and version");
         lcl_error(rIStm, nOldFormat, nPos);