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

collect_unicodes() to check gid < num_glyphs with cmap 12 

fixes #2204
This commit is contained in:
Michiharu Ariza 2020-02-28 08:45:39 -08:00 committed by GitHub
parent 868ecf7b26
commit 15b43a4104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-face.cc
View File

@ -546,7 +546,7 @@ void
hb_face_collect_unicodes (hb_face_t *face, hb_face_collect_unicodes (hb_face_t *face,
hb_set_t *out) hb_set_t *out)
{ {
face->table.cmap->collect_unicodes (out); face->table.cmap->collect_unicodes (out, face->get_num_glyphs ());
} }
/** /**
* hb_face_collect_variation_selectors: * hb_face_collect_variation_selectors:

30
src/hb-ot-cmap-table.hh
View File

@ -539,7 +539,7 @@ struct CmapSubtableLongSegmented
return true; return true;
} }
void collect_unicodes (hb_set_t *out) const void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const
{ {
for (unsigned int i = 0; i < this->groups.len; i++) for (unsigned int i = 0; i < this->groups.len; i++)
{ {
@ -548,7 +548,7 @@ struct CmapSubtableLongSegmented
(hb_codepoint_t) HB_UNICODE_MAX); (hb_codepoint_t) HB_UNICODE_MAX);
for (hb_codepoint_t codepoint = start; codepoint <= end; codepoint++) for (hb_codepoint_t codepoint = start; codepoint <= end; codepoint++)
{ {
hb_codepoint_t gid = T::group_get_glyph (this->groups[i], codepoint); hb_codepoint_t gid = T::group_get_glyph (this->groups[i], codepoint, num_glyphs);
if (unlikely (!gid)) if (unlikely (!gid))
continue; continue;
out->add (codepoint); out->add (codepoint);
@ -576,9 +576,15 @@ struct CmapSubtableLongSegmented
struct CmapSubtableFormat12 : CmapSubtableLongSegmented<CmapSubtableFormat12> struct CmapSubtableFormat12 : CmapSubtableLongSegmented<CmapSubtableFormat12>
{ {
static hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group, static hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group,
hb_codepoint_t u) hb_codepoint_t u, unsigned int num_glyphs = UINT_MAX)
{ return likely (group.startCharCode <= group.endCharCode) ? {
group.glyphID + (u - group.startCharCode) : 0; } hb_codepoint_t g = group.glyphID;
hb_codepoint_t s = group.startCharCode;
return likely (s <= group.endCharCode &&
g < num_glyphs &&
g + (u - s) < num_glyphs) ?
g + (u - s) : 0;
}
template<typename Iterator, template<typename Iterator,
@ -652,8 +658,8 @@ struct CmapSubtableFormat12 : CmapSubtableLongSegmented<CmapSubtableFormat12>
struct CmapSubtableFormat13 : CmapSubtableLongSegmented<CmapSubtableFormat13> struct CmapSubtableFormat13 : CmapSubtableLongSegmented<CmapSubtableFormat13>
{ {
static hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group, static hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group,
hb_codepoint_t u HB_UNUSED) hb_codepoint_t u HB_UNUSED, unsigned int num_glyphs = UINT_MAX)
{ return group.glyphID; } { return likely (group.glyphID < num_glyphs) ? group.glyphID : 0; }
}; };
typedef enum typedef enum
@ -1077,15 +1083,15 @@ struct CmapSubtable
default: return false; default: return false;
} }
} }
void collect_unicodes (hb_set_t *out) const void collect_unicodes (hb_set_t *out, unsigned int num_glyphs = UINT_MAX) const
{ {
switch (u.format) { switch (u.format) {
case 0: u.format0 .collect_unicodes (out); return; case 0: u.format0 .collect_unicodes (out); return;
case 4: u.format4 .collect_unicodes (out); return; case 4: u.format4 .collect_unicodes (out); return;
case 6: u.format6 .collect_unicodes (out); return; case 6: u.format6 .collect_unicodes (out); return;
case 10: u.format10.collect_unicodes (out); return; case 10: u.format10.collect_unicodes (out); return;
case 12: u.format12.collect_unicodes (out); return; case 12: u.format12.collect_unicodes (out, num_glyphs); return;
case 13: u.format13.collect_unicodes (out); return; case 13: u.format13.collect_unicodes (out, num_glyphs); return;
case 14: case 14:
default: return; default: return;
} }
@ -1417,8 +1423,8 @@ struct cmap
return get_nominal_glyph (unicode, glyph); return get_nominal_glyph (unicode, glyph);
} }
void collect_unicodes (hb_set_t *out) const void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const
{ subtable->collect_unicodes (out); } { subtable->collect_unicodes (out, num_glyphs); }
void collect_variation_selectors (hb_set_t *out) const void collect_variation_selectors (hb_set_t *out) const
{ subtable_uvs->collect_variation_selectors (out); } { subtable_uvs->collect_variation_selectors (out); }
void collect_variation_unicodes (hb_codepoint_t variation_selector, void collect_variation_unicodes (hb_codepoint_t variation_selector,

BIN
test/fuzzing/fonts/1746cad6bc3fb2b355db50a5af37c9b58d9ad376 Normal file
View File

Binary file not shown.