diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-12-02 13:03:48 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-02 18:11:34 +0100 |
commit | a322e61b51a04e189618e1d0c8c17f9c080a3d1d (patch) | |
tree | 96deb16b6d7b8882beff5edfd7084e1d03a08863 /filter | |
parent | 5da0f455a63ea22b500943d7ff4c28fbb7a90cfb (diff) |
ofz#19207 check max strlen possible
Change-Id: I5fe9fde240ef375d9de097dda47953320ecc758d
Reviewed-on: https://gerrit.libreoffice.org/84219
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/icgm/class7.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index c85e5284e026..8c2478a308ae 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -127,9 +127,11 @@ void CGM::ImplDoClass7() nAttributes >>= 12; pTextEntry->nAttributes = nAttributes; pAppData += 8; - sal_uInt32 nLen = strlen( reinterpret_cast<char*>( pAppData ) ) + 1; - pTextEntry->pText = new char[ nLen ]; + auto nMaxLen = mpEndValidSource - pAppData; + sal_uInt32 nLen = strnlen(reinterpret_cast<char*>(pAppData), nMaxLen); + pTextEntry->pText = new char[nLen + 1]; memcpy( pTextEntry->pText, pAppData, nLen ); + pTextEntry->pText[nLen] = 0; pAppData += nLen; mpChart->InsertTextEntry( std::move(pTextEntry) ); |