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

[subset] Check for the Null table and not nullptr to detect failure to find a table in glyf accelerator.

Browse Source
This commit is contained in:
Garret Rieger 2018-03-20 17:36:52 -07:00
parent 45def99eae
commit 3f55e0e746
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-glyf-table.hh
View File

@ -236,9 +236,9 @@ struct glyf
hb_blob_t *head_blob = Sanitizer<head>().sanitize (face->reference_table (HB_OT_TAG_head));
const head *head_table = Sanitizer<head>::lock_instance (head_blob);
if (!head_table || (unsigned int) head_table->indexToLocFormat > 1 || head_table->glyphDataFormat != 0)
if (head_table == &Null(head) || (unsigned int) head_table->indexToLocFormat > 1 || head_table->glyphDataFormat != 0)
{
/* Unknown format. Leave num_glyphs=0, that takes care of disabling us. */
/* head table is not present, or in an unknown format. Leave num_glyphs=0, that takes care of disabling us. */
hb_blob_destroy (head_blob);
return;
}
@ -268,7 +268,7 @@ struct glyf
inline bool get_composite (hb_codepoint_t glyph,
CompositeGlyphHeader::Iterator *composite /* OUT */) const
{
if (!this->glyf_table || !num_glyphs)
if (this->glyf_table == &Null(glyf) || !num_glyphs)
return false;
unsigned int start_offset, end_offset;