From 593d7b8dcbf8bd53377137b88416c95b3a2651c8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 23 Aug 2021 20:01:07 +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: Icc09937594ddc97706a63bd11afe062a854ae8ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120921 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 6097ea726dcc087694a600cf823761097e3ba13e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120978 Reviewed-by: Michael Stahl --- vcl/source/filter/ipcd/ipcd.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vcl/source/filter/ipcd/ipcd.cxx b/vcl/source/filter/ipcd/ipcd.cxx index 10c4abc30549..b3377c8934e3 100644 --- a/vcl/source/filter/ipcd/ipcd.cxx +++ b/vcl/source/filter/ipcd/ipcd.cxx @@ -162,7 +162,6 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem ) return bStatus; } - void PCDReader::CheckPCDImagePacFile() { char Buf[ 8 ]; @@ -170,11 +169,10 @@ void PCDReader::CheckPCDImagePacFile() m_rPCD.Seek( 2048 ); m_rPCD.ReadBytes(Buf, 7); Buf[ 7 ] = 0; - if (Buf != std::string_view("PCD_IPI")) + if (!m_rPCD.good() || Buf != std::string_view("PCD_IPI")) bStatus = false; } - void PCDReader::ReadOrientation() { if ( !bStatus ) @@ -184,7 +182,6 @@ void PCDReader::ReadOrientation() nOrientation &= 0x03; } - void PCDReader::ReadImage() { sal_uInt32 nx,ny,nW2,nH2,nYPair,ndy,nXPair; -- cgit