diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-25 09:21:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-25 09:24:01 +0000 |
| commit | f6c465bc8e7583a8321f5c881cb008b980e0e3fa (patch) | |
| tree | 647a240d3e9742f895ec0534f43bb7f0065a156a /vcl | |
| parent | 96b2aa3f820f4cc65904195cde12e305434a732c (diff) | |
ofz#463 unable to mmap
Change-Id: I509faeda019f42bbe7cdc5fc249f2ea2076bb702
Reviewed-on: https://gerrit.libreoffice.org/33519
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/svmconverter.cxx | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 15de1638f1d2..3ef9692b106a 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1110,7 +1110,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, { const sal_Int32 nAryLen = pDXAry ? mnLen : 0; - if( nAryLen ) + if (nAryLen > 0) { mpDXAry.reset( new long[ nAryLen ] ); memcpy( mpDXAry.get(), pDXAry, nAryLen * sizeof(long) ); diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx index 2fba137c6f58..9d963f457dc2 100644 --- a/vcl/source/gdi/svmconverter.cxx +++ b/vcl/source/gdi/svmconverter.cxx @@ -905,6 +905,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) std::unique_ptr<long[]> pDXAry; if (nAryLen > 0) { + const size_t nMinRecordSize = sizeof(sal_Int32); + const size_t nMaxRecords = rIStm.remainingSize() / nMinRecordSize; + if (static_cast<sal_uInt32>(nAryLen) > nMaxRecords) + { + SAL_WARN("vcl.gdi", "Parsing error: " << nMaxRecords << + " max possible entries, but " << nAryLen << " claimed, truncating"); + nAryLen = nMaxRecords; + } + sal_Int32 nStrLen( aStr.getLength() ); pDXAry.reset(new long[ std::max( nAryLen, nStrLen ) ]); |