From e9443070888628f7643741c1abcaaef28de6a53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 19 Jan 2022 20:43:58 +0000 Subject: [PATCH] ofz: Use-of-uninitialized-value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia19985b7c042e6ab9608220343e3b678890f7215 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128638 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- .../source/filter/lwpsdwgrouploaderv0102.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index 35920fb2e7ec..47362c809892 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -238,20 +238,15 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject() { //flag unsigned char BinSignature[2]; - m_pStream->ReadBytes(BinSignature, 2); - if (BinSignature[0] != 'S' || BinSignature[1] != 'M') - { - assert(false); + if (m_pStream->ReadBytes(BinSignature, 2) != 2) + return nullptr; + if (BinSignature[0] != 'S' || BinSignature[1] != 'M') return nullptr; - } //version - unsigned short nVersion; + unsigned short nVersion(0); m_pStream->ReadUInt16(nVersion); if (nVersion<0x0102) - { - assert(false); return nullptr; - } // topObj, botObj m_pStream->SeekRel(4); //record count