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

[glyf] Implement depth limit for add_gid_and_children

This commit is contained in:
Ebrahim Byagowi 2019-10-08 13:50:16 +03:30
parent be0eddd418
commit 1fb9c3b646
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,7 +795,7 @@ struct glyf
bool get_points_var (hb_codepoint_t glyph, bool get_points_var (hb_codepoint_t glyph,
const int *coords, unsigned int coord_count, const int *coords, unsigned int coord_count,
contour_point_vector_t &all_points /* OUT */, contour_point_vector_t &all_points /* OUT */,
unsigned int depth=0) const unsigned int depth = 0) const
{ {
if (unlikely (depth++ > HB_MAX_NESTING_LEVEL)) return false; if (unlikely (depth++ > HB_MAX_NESTING_LEVEL)) return false;
contour_point_vector_t points; contour_point_vector_t points;
@ -1009,8 +1009,10 @@ struct glyf
} }
void void
add_gid_and_children (hb_codepoint_t gid, hb_set_t *gids_to_retain) const add_gid_and_children (hb_codepoint_t gid, hb_set_t *gids_to_retain,
unsigned int depth = 0) const
{ {
if (unlikely (depth++ > HB_MAX_NESTING_LEVEL)) return;
/* Check if is already visited */ /* Check if is already visited */
if (gids_to_retain->has (gid)) return; if (gids_to_retain->has (gid)) return;
@ -1019,7 +1021,7 @@ struct glyf
hb_bytes_t glyph_bytes = bytes_for_glyph (gid); hb_bytes_t glyph_bytes = bytes_for_glyph (gid);
const GlyphHeader &glyph_header = *glyph_bytes.as<GlyphHeader> (); const GlyphHeader &glyph_header = *glyph_bytes.as<GlyphHeader> ();
for (auto &item : glyph_header.get_composite_iterator (glyph_bytes)) for (auto &item : glyph_header.get_composite_iterator (glyph_bytes))
add_gid_and_children (item.glyphIndex, gids_to_retain); add_gid_and_children (item.glyphIndex, gids_to_retain, depth);
} }
private: private: