diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-29 20:59:40 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-19 13:57:44 +0200 |
| commit | d21ff7f16cb2fb923df4a27fbf8ee67de6d54b29 (patch) | |
| tree | 16b5ab5b7d5ad967ac30624cf681dd5454056bb6 | |
| parent | ofz#20622 oom (diff) | |
| download | core-d21ff7f16cb2fb923df4a27fbf8ee67de6d54b29.tar.gz core-d21ff7f16cb2fb923df4a27fbf8ee67de6d54b29.zip | |
ofz#25989 cmap parsing
Change-Id: I048e5d88d5926a4afa75afab18db5ca6354e2454
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103641
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9a1202edab0cfe95572f12a8c49ef756ead49bf2)
| -rw-r--r-- | vcl/source/font/fontcharmap.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index ade991626dd9..0f638beff51c 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -206,7 +206,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) // update the glyphid-array with the glyphs in this range pStartGlyphs[i] = -static_cast<int>(aGlyphIdArray.size()); const unsigned char* pGlyphIdPtr = pOffsetBase + 2*i + nRangeOffset; - const size_t nRemainingSize = pEndValidArea - pGlyphIdPtr; + const size_t nRemainingSize = pEndValidArea >= pGlyphIdPtr ? pEndValidArea - pGlyphIdPtr : 0; const size_t nMaxPossibleRecords = nRemainingSize/2; if (nMaxPossibleRecords == 0) { // no sane font should trigger this SAL_WARN("vcl.gdi", "More indexes claimed that space available in font!"); |