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

Don't allow reference blob be accessed using empty tag in hb_face_reference_table (#1947)

This commit is contained in:
Ebrahim Byagowi 2019-09-01 02:18:09 +04:30 committed by Behdad Esfahbod
parent c9eb913f4c
commit f441a7c008
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-face.cc
View File

@ -367,6 +367,9 @@ hb_blob_t *
hb_face_reference_table (const hb_face_t *face, hb_face_reference_table (const hb_face_t *face,
hb_tag_t tag) hb_tag_t tag)
{ {
if (unlikely (tag == HB_TAG_NONE))
return hb_blob_get_empty ();
return face->reference_table (tag); return face->reference_table (tag);
} }

5
src/hb-subset.cc
View File

@ -238,11 +238,6 @@ _subset_table (hb_subset_plan_t *plan,
static bool static bool
_should_drop_table (hb_subset_plan_t *plan, hb_tag_t tag) _should_drop_table (hb_subset_plan_t *plan, hb_tag_t tag)
{ {
if (unlikely (!tag))
/* Drop tables with no tag as that means table header in
_hb_face_builder_reference_table */
return true;
if (plan->drop_tables->has (tag)) if (plan->drop_tables->has (tag))
return true; return true;