filter/source/graphicfilter/icgm/class7.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a322e61b51a04e189618e1d0c8c17f9c080a3d1d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 2 13:03:48 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Dec 2 18:11:34 2019 +0100
ofz#19207 check max strlen possible
Change-Id: I5fe9fde240ef375d9de097dda47953320ecc758d
Reviewed-on: https://gerrit.libreoffice.org/84219
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
