diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-08-23 20:01:07 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-25 22:46:29 +0200 |
commit | 593d7b8dcbf8bd53377137b88416c95b3a2651c8 (patch) | |
tree | e9a747103dc9dbab48f8b89e1d431e6e6a034923 | |
parent | tdf#128612: Support applying pattern fill from toolbar (diff) | |
download | core-593d7b8dcbf8bd53377137b88416c95b3a2651c8.tar.gz core-593d7b8dcbf8bd53377137b88416c95b3a2651c8.zip |
ofz: MemorySanitizer: use-of-uninitialized-value
Change-Id: Icc09937594ddc97706a63bd11afe062a854ae8ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 6097ea726dcc087694a600cf823761097e3ba13e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120978
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r-- | vcl/source/filter/ipcd/ipcd.cxx | 5 |
1 files changed, 1 insertions, 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; |