diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-07 16:51:32 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-02-08 12:02:41 +0100 |
| commit | c666621f8635d7814fc6e05169cbac0a49b67f71 (patch) | |
| tree | 831b30d74ec8b128093802111c44b5810b41a2a4 | |
| parent | check kern table size (diff) | |
| download | core-c666621f8635d7814fc6e05169cbac0a49b67f71.tar.gz core-c666621f8635d7814fc6e05169cbac0a49b67f71.zip | |
what matters is the availability of the last element, not the first
Change-Id: I23d3abdbe62b735d66261fb337613da88cc4206b
Reviewed-on: https://gerrit.libreoffice.org/49379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index b66324a5a730..d69a6132d938 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2433,7 +2433,8 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info) info->symbolEncoded = (ttf->cmapType == CMAP_MS_Symbol); const sal_uInt8* table = getTable(ttf, O_OS2); - if (table) { + sal_uInt32 table_size = getTableSize(ttf, O_OS2); + if (table && table_size >= 42) { info->weight = GetUInt16(table, 4); info->width = GetUInt16(table, 6); @@ -2441,7 +2442,7 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info) * Microsoft old (78 bytes long) and Microsoft new (86 bytes long,) * Apple's documentation recommends looking at the table length. */ - if (getTableSize(ttf, O_OS2) > 68) { + if (table_size >= 78) { info->typoAscender = XUnits(UPEm,GetInt16(table, 68)); info->typoDescender = XUnits(UPEm, GetInt16(table, 70)); info->typoLineGap = XUnits(UPEm, GetInt16(table, 72)); |