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

[subset] Allocate space for null entry in script/feature list.

This commit is contained in:
Garret Rieger 2022-07-05 17:49:12 +00:00
parent dbfd2bf327
commit 216cf5946b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-subset-plan.cc
View File

@ -99,7 +99,7 @@ static bool _filter_tag_list(hb_vector_t<hb_tag_t>* tags, /* IN/OUT */
const hb_set_t* filter) const hb_set_t* filter)
{ {
hb_vector_t<hb_tag_t> out; hb_vector_t<hb_tag_t> out;
out.alloc (tags->get_size()); out.alloc (tags->get_size() + 1); // +1 is to allocate room for the null terminator.
bool removed = false; bool removed = false;
hb_set_t visited; hb_set_t visited;
@ -129,18 +129,16 @@ static void _collect_layout_indices (hb_subset_plan_t *plan,
layout_collect_func_t layout_collect_func, layout_collect_func_t layout_collect_func,
hb_set_t *indices /* OUT */) hb_set_t *indices /* OUT */)
{ {
unsigned num_features = table.get_feature_count () + 1; unsigned num_features = table.get_feature_count ();
hb_vector_t<hb_tag_t> features; hb_vector_t<hb_tag_t> features;
if (!plan->check_success (features.resize (num_features))) return; if (!plan->check_success (features.resize (num_features))) return;
table.get_feature_tags (0, &num_features, features.arrayZ); table.get_feature_tags (0, &num_features, features.arrayZ);
features.resize (num_features);
bool retain_all_features = !_filter_tag_list (&features, plan->layout_features); bool retain_all_features = !_filter_tag_list (&features, plan->layout_features);
unsigned num_scripts = table.get_script_count () + 1; unsigned num_scripts = table.get_script_count ();
hb_vector_t<hb_tag_t> scripts; hb_vector_t<hb_tag_t> scripts;
if (!plan->check_success (scripts.resize (num_scripts))) return; if (!plan->check_success (scripts.resize (num_scripts))) return;
table.get_script_tags (0, &num_scripts, scripts.arrayZ); table.get_script_tags (0, &num_scripts, scripts.arrayZ);
scripts.resize (num_scripts);
bool retain_all_scripts = !_filter_tag_list (&scripts, plan->layout_scripts); bool retain_all_scripts = !_filter_tag_list (&scripts, plan->layout_scripts);
if (!plan->check_success (!features.in_error ()) || !features if (!plan->check_success (!features.in_error ()) || !features

2
src/hb-subset.h
View File

@ -101,7 +101,7 @@ typedef enum { /*< flags >*/
* @HB_SUBSET_SETS_LAYOUT_FEATURE_TAG: the set of layout feature tags that will be retained * @HB_SUBSET_SETS_LAYOUT_FEATURE_TAG: the set of layout feature tags that will be retained
* in the subset. * in the subset.
* @HB_SUBSET_SETS_LAYOUT_SCRIPT_TAG: the set of layout script tags that will be retained * @HB_SUBSET_SETS_LAYOUT_SCRIPT_TAG: the set of layout script tags that will be retained
* in the subset. Defaults to all tags. * in the subset. Defaults to all tags. Since: REPLACEME
* *
* List of sets that can be configured on the subset input. * List of sets that can be configured on the subset input.
* *