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

[subset] fix infinite loop bug in looping through tables for subsetting.

This commit is contained in:
Garret Rieger 2018-03-27 10:42:19 -07:00
parent 8fd55422c3
commit 1c3372786c
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-subset.cc
View File

@ -363,8 +363,8 @@ hb_subset (hb_face_t *source,
continue; continue;
} }
success = success && _subset_table (plan, tag); success = success && _subset_table (plan, tag);
offset += count;
} }
offset += count;
} while (count == ARRAY_LENGTH (table_tags)); } while (count == ARRAY_LENGTH (table_tags));
hb_face_t *result = success ? hb_face_reference(plan->dest) : hb_face_get_empty(); hb_face_t *result = success ? hb_face_reference(plan->dest) : hb_face_get_empty();

BIN
test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016 Normal file
View File

Binary file not shown.

23
test/api/test-subset.c
View File

@ -51,6 +51,28 @@ test_subset_32_tables (void)
hb_face_destroy (face); hb_face_destroy (face);
} }
static void
test_subset_no_inf_loop (void)
{
hb_face_t *face = hb_subset_test_open_font("fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016");
hb_subset_input_t *input = hb_subset_input_create_or_fail ();
hb_set_t *codepoints = hb_subset_input_unicode_set (input);
hb_set_add (codepoints, 'a');
hb_set_add (codepoints, 'b');
hb_set_add (codepoints, 'c');
hb_subset_profile_t *profile = hb_subset_profile_create();
hb_face_t *subset = hb_subset (face, profile, input);
g_assert (subset);
g_assert (subset == hb_face_get_empty ());
hb_subset_input_destroy (input);
hb_subset_profile_destroy (profile);
hb_face_destroy (subset);
hb_face_destroy (face);
}
static void static void
test_subset_crash (void) test_subset_crash (void)
{ {
@ -79,6 +101,7 @@ main (int argc, char **argv)
hb_test_init (&argc, &argv); hb_test_init (&argc, &argv);
hb_test_add (test_subset_32_tables); hb_test_add (test_subset_32_tables);
hb_test_add (test_subset_no_inf_loop);
hb_test_add (test_subset_crash); hb_test_add (test_subset_crash);
return hb_test_run(); return hb_test_run();