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

[subset] Fix memory leak caused by failure to cleanup glyf accelerator

This commit is contained in:
Rod Sheeter 2019-05-20 20:40:55 -07:00
parent 5cedda5e4a
commit 3a43603ece
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,28 +148,11 @@ struct glyf
glyf *glyf_prime = c->serializer->start_embed <glyf> (); glyf *glyf_prime = c->serializer->start_embed <glyf> ();
if (unlikely (!glyf_prime)) return_trace (false); if (unlikely (!glyf_prime)) return_trace (false);
OT::glyf::accelerator_t glyf;
glyf.init (c->plan->source);
// Byte region(s) per glyph to output // Byte region(s) per glyph to output
// unpadded, hints removed if so requested // unpadded, hints removed if so requested
// If we fail to process a glyph we produce an empty (0-length) glyph // If we fail to process a glyph we produce an empty (0-length) glyph
hb_vector_t<SubsetGlyph> glyphs; hb_vector_t<SubsetGlyph> glyphs;
+ hb_range (c->plan->num_output_glyphs ()) _populate_subset_glyphs (c->plan, &glyphs);
| hb_map ([&] (hb_codepoint_t new_gid) {
SubsetGlyph subset_glyph;
subset_glyph.new_gid = new_gid;
// should never fail: all old gids should be mapped
if (!c->plan->old_gid_for_new_gid (new_gid, &subset_glyph.old_gid)) return subset_glyph;
subset_glyph.source_glyph = glyf.bytes_for_glyph ((const char *) this, subset_glyph.old_gid);
if (c->plan->drop_hints) subset_glyph.drop_hints (glyf);
else subset_glyph.dest_start = subset_glyph.source_glyph;
return subset_glyph;
})
| hb_sink (glyphs);
glyf_prime->serialize (c->serializer, hb_iter (glyphs), c->plan); glyf_prime->serialize (c->serializer, hb_iter (glyphs), c->plan);
@ -183,6 +166,33 @@ struct glyf
return_trace (true); return_trace (true);
} }
template <typename SubsetGlyph>
void
_populate_subset_glyphs (const hb_subset_plan_t * plan,
hb_vector_t<SubsetGlyph> * glyphs /* OUT */) const
{
OT::glyf::accelerator_t glyf;
glyf.init (plan->source);
+ hb_range (plan->num_output_glyphs ())
| hb_map ([&] (hb_codepoint_t new_gid) {
SubsetGlyph subset_glyph;
subset_glyph.new_gid = new_gid;
// should never fail: all old gids should be mapped
if (!plan->old_gid_for_new_gid (new_gid, &subset_glyph.old_gid)) return subset_glyph;
subset_glyph.source_glyph = glyf.bytes_for_glyph ((const char *) this, subset_glyph.old_gid);
if (plan->drop_hints) subset_glyph.drop_hints (glyf);
else subset_glyph.dest_start = subset_glyph.source_glyph;
return subset_glyph;
})
| hb_sink (glyphs);
glyf.fini();
}
static void static void
_fix_component_gids (const hb_subset_plan_t *plan, _fix_component_gids (const hb_subset_plan_t *plan,
hb_bytes_t glyph) hb_bytes_t glyph)