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

[subset] Limit the number of feature indices processed during script subsetting.

This commit is contained in:
Garret Rieger 2020-02-28 15:15:55 -08:00
parent 75622b0d24
commit 414529e45a
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-ot-layout-common.hh
View File

@ -60,8 +60,12 @@
#define HB_MAX_LANGSYS 2000
#endif
#ifndef HB_MAX_FEATURES
#define HB_MAX_FEATURES 750
#endif
#ifndef HB_MAX_FEATURE_INDICES
#define HB_MAX_FEATURE_INDICES 2000
#define HB_MAX_FEATURE_INDICES 1500
#endif
@ -103,6 +107,12 @@ struct hb_subset_layout_context_t :
return langsys_count++ < HB_MAX_LANGSYS;
}
bool visitFeatureIndex (int count)
{
feature_index_count += count;
return feature_index_count < HB_MAX_FEATURE_INDICES;
}
hb_subset_context_t *subset_context;
const hb_tag_t table_tag;
const hb_map_t *lookup_index_map;
@ -119,11 +129,14 @@ struct hb_subset_layout_context_t :
feature_index_map (feature_map_),
debug_depth (0),
script_count (0),
langsys_count (0) {}
langsys_count (0),
feature_index_count (0)
{}
private:
unsigned script_count;
unsigned langsys_count;
unsigned feature_index_count;
};
template<typename OutputArray>
@ -516,6 +529,9 @@ struct LangSys
out->reqFeatureIndex = l->feature_index_map->has (reqFeatureIndex) ? l->feature_index_map->get (reqFeatureIndex) : 0xFFFFu;
if (!l->visitFeatureIndex (featureIndex.len))
return_trace (false);
auto it =
+ hb_iter (featureIndex)
| hb_filter (l->feature_index_map)

2
src/hb-ot-layout-gsubgpos.hh
View File

@ -3104,7 +3104,7 @@ struct GSUBGPOS
void closure_features (const hb_map_t *lookup_indexes, /* IN */
hb_set_t *feature_indexes /* OUT */) const
{
unsigned int feature_count = hb_min (get_feature_count (), (unsigned) HB_MAX_FEATURE_INDICES);
unsigned int feature_count = hb_min (get_feature_count (), (unsigned) HB_MAX_FEATURES);
for (unsigned i = 0; i < feature_count; i++)
{
if (get_feature (i).intersects_lookup_indexes (lookup_indexes))