From dfde7cef704533fa9e352225ee596da7e2e106d1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 30 Aug 2021 17:03:06 +0100 Subject: ofz: MemorySanitizer: use-of-uninitialized-value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I40ab9dc8b320990abcf89630984892e040a8544d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121380 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- emfio/source/reader/emfreader.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'emfio/source') diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index ff1ce2a75fa2..e6330987f1bc 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1657,13 +1657,13 @@ namespace emfio else cxSrc = cySrc = 0; - Bitmap aBitmap; - tools::Rectangle aRect( Point( xDest, yDest ), Size( cxDest, cyDest ) ); - if (!mpInputStream->good() || (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc)) bStatus = false; else { + Bitmap aBitmap; + tools::Rectangle aRect(Point(xDest, yDest), Size(cxDest, cyDest)); + sal_uInt32 nSize = cbBmiSrc + cbBitsSrc + 14; if ( nSize <= ( mnEndPos - mnStartPos ) ) { -- cgit