From eba1c16a604d1be774f22541bf3e417f27a27c68 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 8 May 2018 02:47:42 -0700 Subject: [PATCH] Always lock blob in sanitize. Remove blob->lock_as() in favor of blob->lock() --- src/dump-emoji.cc | 4 ++-- src/dump-fon.cc | 2 +- src/hb-aat-layout.cc | 4 ++-- src/hb-blob-private.hh | 6 ------ src/hb-face.cc | 8 ++++---- src/hb-open-type-private.hh | 8 ++++++-- src/hb-ot-cmap-table.hh | 2 +- src/hb-ot-color-cbdt-table.hh | 4 ++-- src/hb-ot-color-sbix-table.hh | 2 +- src/hb-ot-color-svg-table.hh | 2 +- src/hb-ot-glyf-table.hh | 6 +++--- src/hb-ot-hmtx-table.hh | 8 ++++---- src/hb-ot-kern-table.hh | 2 +- src/hb-ot-layout.cc | 6 +++--- src/hb-ot-post-table.hh | 2 +- src/hb-subset.cc | 2 +- src/main.cc | 2 +- 17 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/dump-emoji.cc b/src/dump-emoji.cc index 47c6c98ba..63af4a6a2 100644 --- a/src/dump-emoji.cc +++ b/src/dump-emoji.cc @@ -240,11 +240,11 @@ int main (int argc, char **argv) OT::Sanitizer sanitizerCOLR; hb_blob_t* colr_blob = sanitizerCOLR.sanitize (face->reference_table (HB_OT_TAG_COLR)); - const OT::COLR *colr = colr_blob->lock_as (); + const OT::COLR *colr = colr_blob->as (); OT::Sanitizer sanitizerCPAL; hb_blob_t* cpal_blob = sanitizerCPAL.sanitize (face->reference_table (HB_OT_TAG_CPAL)); - const OT::CPAL *cpal = cpal_blob->lock_as (); + const OT::CPAL *cpal = cpal_blob->as (); cairo_font_face_t *cairo_face; { diff --git a/src/dump-fon.cc b/src/dump-fon.cc index dc45d9c4f..81525f429 100644 --- a/src/dump-fon.cc +++ b/src/dump-fon.cc @@ -542,7 +542,7 @@ int main (int argc, char** argv) { OT::Sanitizer sanitizer; hb_blob_t *font_blob = sanitizer.sanitize (blob); - const LE_IMAGE_DOS_HEADER* dos_header = font_blob->lock_as (); + const LE_IMAGE_DOS_HEADER* dos_header = font_blob->as (); const NE_RESOURCE_TABLE &rtable = dos_header->get_os2_header ().get_resource_table (); int shift = rtable.get_shift_value (); diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc index e6efaab4c..7784fae33 100644 --- a/src/hb-aat-layout.cc +++ b/src/hb-aat-layout.cc @@ -118,11 +118,11 @@ _get_trak (hb_face_t *face, hb_blob_t **blob = nullptr) // OT::Sanitizer sanitizer; // sanitizer.set_num_glyphs (face->get_num_glyphs ()); // hb_blob_t *morx_blob = sanitizer.sanitize (face->reference_table (HB_AAT_TAG_morx)); -// morx_blob->lock_as (); +// morx_blob->as (); // if (0) // { -// morx_blob->lock_as > ()->get_value (1, face->get_num_glyphs ()); +// morx_blob->as > ()->get_value (1, face->get_num_glyphs ()); // } // } diff --git a/src/hb-blob-private.hh b/src/hb-blob-private.hh index f564351ad..b72fa721b 100644 --- a/src/hb-blob-private.hh +++ b/src/hb-blob-private.hh @@ -69,12 +69,6 @@ struct hb_blob_t { return unlikely (!data) ? &Null(Type) : reinterpret_cast (data); } - template - inline const Type* lock_as (void) - { - lock (); - return unlikely (!data) ? &Null(Type) : reinterpret_cast (data); - } public: hb_object_header_t header; diff --git a/src/hb-face.cc b/src/hb-face.cc index 9fc40d48a..01271413e 100644 --- a/src/hb-face.cc +++ b/src/hb-face.cc @@ -135,7 +135,7 @@ _hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void if (tag == HB_TAG_NONE) return hb_blob_reference (data->blob); - const OT::OpenTypeFontFile &ot_file = *data->blob->lock_as (); + const OT::OpenTypeFontFile &ot_file = *data->blob->as (); const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index); const OT::OpenTypeTable &table = ot_face.get_table_by_tag (tag); @@ -426,7 +426,7 @@ void hb_face_t::load_upem (void) const { hb_blob_t *head_blob = OT::Sanitizer().sanitize (reference_table (HB_OT_TAG_head)); - const OT::head *head_table = head_blob->lock_as (); + const OT::head *head_table = head_blob->as (); upem = head_table->get_upem (); hb_blob_destroy (head_blob); } @@ -470,7 +470,7 @@ void hb_face_t::load_num_glyphs (void) const { hb_blob_t *maxp_blob = OT::Sanitizer().sanitize (reference_table (HB_OT_TAG_maxp)); - const OT::maxp *maxp_table = maxp_blob->lock_as (); + const OT::maxp *maxp_table = maxp_blob->as (); num_glyphs = maxp_table->get_num_glyphs (); hb_blob_destroy (maxp_blob); } @@ -500,7 +500,7 @@ hb_face_get_table_tags (hb_face_t *face, hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) face->user_data; - const OT::OpenTypeFontFile &ot_file = *data->blob->lock_as (); + const OT::OpenTypeFontFile &ot_file = *data->blob->as (); const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index); return ot_face.get_table_tags (start_offset, table_count, table_tags); diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 9f07b3f56..8bc741698 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -344,8 +344,12 @@ struct Sanitizer DEBUG_MSG_FUNC (SANITIZE, c->start, sane ? "PASSED" : "FAILED"); if (sane) + { + blob->lock (); return blob; - else { + } + else + { hb_blob_destroy (blob); return hb_blob_get_empty (); } @@ -1250,7 +1254,7 @@ struct hb_lazy_table_loader_t if (unlikely (!p)) { hb_blob_t *blob_ = OT::Sanitizer().sanitize (face->reference_table (T::tableTag)); - p = const_cast(blob_->lock_as ()); + p = const_cast(blob_->as ()); if (!hb_atomic_ptr_cmpexch (const_cast(&instance), nullptr, p)) { hb_blob_destroy (blob_); diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 438063e0e..950a0ee11 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -661,7 +661,7 @@ struct cmap inline void init (hb_face_t *face) { this->blob = OT::Sanitizer().sanitize (face->reference_table (HB_OT_TAG_cmap)); - const OT::cmap *cmap = this->blob->lock_as (); + const OT::cmap *cmap = this->blob->as (); const OT::CmapSubtable *subtable = nullptr; const OT::CmapSubtableFormat14 *subtable_uvs = nullptr; diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh index 52364ff79..f4207f2db 100644 --- a/src/hb-ot-color-cbdt-table.hh +++ b/src/hb-ot-color-cbdt-table.hh @@ -403,8 +403,8 @@ struct CBDT cbdt = nullptr; return; /* Not a bitmap font. */ } - cblc = cblc_blob->lock_as (); - cbdt = cbdt_blob->lock_as (); + cblc = cblc_blob->as (); + cbdt = cbdt_blob->as (); } diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh index 17d6c730c..09a9517c4 100644 --- a/src/hb-ot-color-sbix-table.hh +++ b/src/hb-ot-color-sbix-table.hh @@ -102,7 +102,7 @@ struct sbix sanitizer.set_num_glyphs (num_glyphs); sbix_blob = sanitizer.sanitize (face->reference_table (HB_OT_TAG_sbix)); sbix_len = hb_blob_get_length (sbix_blob); - sbix_table = sbix_blob->lock_as (); + sbix_table = sbix_blob->as (); } diff --git a/src/hb-ot-color-svg-table.hh b/src/hb-ot-color-svg-table.hh index ccf4b9c41..ed6cf9708 100644 --- a/src/hb-ot-color-svg-table.hh +++ b/src/hb-ot-color-svg-table.hh @@ -99,7 +99,7 @@ struct SVG OT::Sanitizer sanitizer; svg_blob = sanitizer.sanitize (face->reference_table (HB_OT_TAG_SVG)); svg_len = hb_blob_get_length (svg_blob); - svg = svg_blob->lock_as (); + svg = svg_blob->as (); } diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh index 071696877..8c2bfd097 100644 --- a/src/hb-ot-glyf-table.hh +++ b/src/hb-ot-glyf-table.hh @@ -237,7 +237,7 @@ struct glyf memset (this, 0, sizeof (accelerator_t)); hb_blob_t *head_blob = Sanitizer().sanitize (face->reference_table (HB_OT_TAG_head)); - const head *head_table = head_blob->lock_as (); + const head *head_table = head_blob->as (); if (head_table == &Null(head) || (unsigned int) head_table->indexToLocFormat > 1 || head_table->glyphDataFormat != 0) { /* head table is not present, or in an unknown format. Leave num_glyphs=0, that takes care of disabling us. */ @@ -248,9 +248,9 @@ struct glyf hb_blob_destroy (head_blob); loca_blob = Sanitizer().sanitize (face->reference_table (HB_OT_TAG_loca)); - loca_table = loca_blob->lock_as (); + loca_table = loca_blob->as (); glyf_blob = Sanitizer().sanitize (face->reference_table (HB_OT_TAG_glyf)); - glyf_table = glyf_blob->lock_as (); + glyf_table = glyf_blob->as (); num_glyphs = MAX (1u, hb_blob_get_length (loca_blob) / (short_offset ? 2 : 4)) - 1; glyf_len = hb_blob_get_length (glyf_blob); diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh index 02419a886..c07763e67 100644 --- a/src/hb-ot-hmtx-table.hh +++ b/src/hb-ot-hmtx-table.hh @@ -196,7 +196,7 @@ struct hmtxvmtx if (T::os2Tag) { hb_blob_t *os2_blob = Sanitizer ().sanitize (face->reference_table (T::os2Tag)); - const os2 *os2_table = os2_blob->lock_as (); + const os2 *os2_table = os2_blob->as (); #define USE_TYPO_METRICS (1u<<7) if (0 != (os2_table->fsSelection & USE_TYPO_METRICS)) { @@ -209,7 +209,7 @@ struct hmtxvmtx } hb_blob_t *_hea_blob = Sanitizer ().sanitize (face->reference_table (H::tableTag)); - const H *_hea_table = _hea_blob->lock_as (); + const H *_hea_table = _hea_blob->as (); num_advances = _hea_table->numberOfLongMetrics; if (!got_font_extents) { @@ -238,10 +238,10 @@ struct hmtxvmtx hb_blob_destroy (blob); blob = hb_blob_get_empty (); } - table = blob->lock_as (); + table = blob->as (); var_blob = Sanitizer ().sanitize (face->reference_table (T::variationsTag)); - var_table = var_blob->lock_as (); + var_table = var_blob->as (); } inline void fini (void) diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh index 71b368a87..9366dbf48 100644 --- a/src/hb-ot-kern-table.hh +++ b/src/hb-ot-kern-table.hh @@ -363,7 +363,7 @@ struct kern inline void init (hb_face_t *face) { blob = Sanitizer().sanitize (face->reference_table (HB_OT_TAG_kern)); - table = blob->lock_as (); + table = blob->as (); table_length = hb_blob_get_length (blob); } inline void fini (void) diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index a4673fc54..d5efde294 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -59,13 +59,13 @@ _hb_ot_layout_create (hb_face_t *face) return nullptr; layout->gdef_blob = OT::Sanitizer().sanitize (face->reference_table (HB_OT_TAG_GDEF)); - layout->gdef = layout->gdef_blob->lock_as (); + layout->gdef = layout->gdef_blob->as (); layout->gsub_blob = OT::Sanitizer().sanitize (face->reference_table (HB_OT_TAG_GSUB)); - layout->gsub = layout->gsub_blob->lock_as (); + layout->gsub = layout->gsub_blob->as (); layout->gpos_blob = OT::Sanitizer().sanitize (face->reference_table (HB_OT_TAG_GPOS)); - layout->gpos = layout->gpos_blob->lock_as (); + layout->gpos = layout->gpos_blob->as (); layout->math.init (face); layout->fvar.init (face); diff --git a/src/hb-ot-post-table.hh b/src/hb-ot-post-table.hh index d1793d353..bb5f9b313 100644 --- a/src/hb-ot-post-table.hh +++ b/src/hb-ot-post-table.hh @@ -110,7 +110,7 @@ struct post inline void init (hb_face_t *face) { blob = Sanitizer().sanitize (face->reference_table (HB_OT_TAG_post)); - const post *table = blob->lock_as (); + const post *table = blob->as (); unsigned int table_length = hb_blob_get_length (blob); version = table->version.to_int (); diff --git a/src/hb-subset.cc b/src/hb-subset.cc index bca567702..d6295a48f 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc @@ -87,7 +87,7 @@ _subset (hb_subset_plan_t *plan) OT::Sanitizer sanitizer; hb_blob_t *source_blob = sanitizer.sanitize (plan->source->reference_table (TableType::tableTag)); - const TableType *table = source_blob->lock_as (); + const TableType *table = source_blob->as (); hb_tag_t tag = TableType::tableTag; hb_bool_t result = false; diff --git a/src/main.cc b/src/main.cc index 2976c895b..9a1873665 100644 --- a/src/main.cc +++ b/src/main.cc @@ -56,7 +56,7 @@ main (int argc, char **argv) Sanitizer sanitizer; hb_blob_t *font_blob = sanitizer.sanitize (blob); - const OpenTypeFontFile* sanitized = font_blob->lock_as (); + const OpenTypeFontFile* sanitized = font_blob->as (); if (sanitized == &Null (OpenTypeFontFile)) { printf ("Sanitization of the file wasn't successful. Exit");