walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sanitize] Fix sanitizing sublookup array

This commit is contained in:
Behdad Esfahbod 2018-12-12 09:56:47 -05:00
parent c78e4784fb
commit 602fbfe3c9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-ot-layout-common.hh
View File

@ -760,6 +760,14 @@ struct Lookup
return_trace (true); return_trace (true);
} }
/* Older compilers need this to NOT be locally defined in a function. */
template <typename TSubTable>
struct SubTableSanitizeWrapper : TSubTable
{
inline bool sanitize (hb_sanitize_context_t *c, unsigned int lookup_type) const
{ return this->dispatch (c, lookup_type); }
};
template <typename TSubTable> template <typename TSubTable>
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
@ -771,7 +779,9 @@ struct Lookup
if (!markFilteringSet.sanitize (c)) return_trace (false); if (!markFilteringSet.sanitize (c)) return_trace (false);
} }
if (unlikely (!dispatch<TSubTable> (c))) return_trace (false); if (unlikely (!CastR<OffsetArrayOf<SubTableSanitizeWrapper<TSubTable> > > (subTable)
.sanitize (c, this, get_type ())))
return_trace (false);
if (unlikely (get_type () == TSubTable::Extension)) if (unlikely (get_type () == TSubTable::Extension))
{ {