_hb_face_get_table_from_blob (hb_tag_t tag, void *user_data)
{
hb_face_t *face = (hb_face_t *) user_data;
- const char *data = hb_blob_lock (face->blob);
- /* XXX sanitize */
-
- const OpenTypeFontFile &ot_file = OpenTypeFontFile::get_for_data (data);
+ const OpenTypeFontFile &ot_file = Sanitizer<OpenTypeFontFile>::lock_instance (face->blob);
const OpenTypeFontFace &ot_face = ot_file.get_face (face->index);
const OpenTypeTable &table = ot_face.get_table_by_tag (tag);
if (!HB_OBJECT_DO_CREATE (hb_face_t, face))
return &_hb_face_nil;
- face->blob = hb_blob_reference (blob);
+ face->blob = Sanitizer<OpenTypeFontFile>::sanitize (hb_blob_reference (blob));
face->index = index;
face->get_table = _hb_face_get_table_from_blob;
face->user_data = face;
/* XXX sanitize */
- layout->gdef_blob = hb_face_get_table (face, HB_OT_TAG_GDEF);
- layout->gdef = &GDEF::get_for_data (hb_blob_lock (layout->gdef_blob));
+ layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_get_table (face, HB_OT_TAG_GDEF));
+ layout->gdef = &Sanitizer<GDEF>::lock_instance (layout->gdef_blob);
- layout->gsub_blob = hb_face_get_table (face, HB_OT_TAG_GSUB);
- layout->gsub = &GSUB::get_for_data (hb_blob_lock (layout->gsub_blob));
+ layout->gsub_blob = Sanitizer<GSUB>::sanitize (hb_face_get_table (face, HB_OT_TAG_GSUB));
+ layout->gsub = &Sanitizer<GSUB>::lock_instance (layout->gsub_blob);
- layout->gpos_blob = hb_face_get_table (face, HB_OT_TAG_GPOS);
- layout->gpos = &GPOS::get_for_data (hb_blob_lock (layout->gpos_blob));
+ layout->gpos_blob = Sanitizer<GPOS>::sanitize (hb_face_get_table (face, HB_OT_TAG_GPOS));
+ layout->gpos = &Sanitizer<GPOS>::lock_instance (layout->gpos_blob);
}
void