summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-03-13 10:48:47 +0000
committerThorsten Behrens <thorsten.behrens@allotropia.de>2022-03-19 12:42:52 +0100
commit4e679d65674190fa5fa980d8fd6f0ffce71dd4af (patch)
treeba3355b5c3817fc204326f4ddcdce0c99a02a873
parentcb58014691eaa278e4bd19dd0ab65524846c8adc (diff)
ofz#45524 string is presumed to be at least length 1
Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131468 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit eca150aeb9254a3c04d15be5a6278c2c65bf3fb0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131622 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-rw-r--r--lotuswordpro/source/filter/lwpdrawobj.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index fd5355ac3295..1489cf14cfdb 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -1255,7 +1255,11 @@ void LwpDrawTextArt::Read()
- (m_aTextArtRec.aPath[1].n*3 + 1)*4;
- if (!m_pStream->good() || m_aTextArtRec.nTextLen > m_pStream->remainingSize())
+ if (!m_pStream->good())
+ throw BadRead();
+ if (m_aTextArtRec.nTextLen > m_pStream->remainingSize())
+ throw BadRead();
+ if (m_aTextArtRec.nTextLen < 1)
throw BadRead();
m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];