diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh index 6b77d2f7f..ef75dce9c 100644 --- a/src/hb-ot-cff1-table.hh +++ b/src/hb-ot-cff1-table.hh @@ -205,6 +205,7 @@ struct Encoding case 1: { + if (unlikely (code_ranges.length > 0xFF)) return_trace (false); Encoding1 *fmt1 = c->allocate_size (Encoding1::min_size + Encoding1_Range::static_size * code_ranges.length); if (unlikely (!fmt1)) return_trace (false); fmt1->nRanges () = code_ranges.length; diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc index 0f969cc8d..4ccb1ad61 100644 --- a/src/hb-subset-cff1.cc +++ b/src/hb-subset-cff1.cc @@ -487,11 +487,12 @@ struct cff1_subset_plan subset_enc_code_ranges.complete (glyph); - assert (subset_enc_num_codes <= 0xFF); size0 = Encoding0::min_size + HBUINT8::static_size * subset_enc_num_codes; size1 = Encoding1::min_size + Encoding1_Range::static_size * subset_enc_code_ranges.length; - if (size0 < size1) + /* Format 0 holds at most 255 codes; a format 1 source encoding + * can give codes to more glyphs than that. */ + if (subset_enc_num_codes <= 0xFF && size0 < size1) subset_enc_format = 0; else subset_enc_format = 1; diff --git a/test/api/fonts/cff1_encoding_many_codes.300.retaingids.otf b/test/api/fonts/cff1_encoding_many_codes.300.retaingids.otf new file mode 100644 index 000000000..6f9ccc5f2 Binary files /dev/null and b/test/api/fonts/cff1_encoding_many_codes.300.retaingids.otf differ diff --git a/test/api/fonts/cff1_encoding_many_codes.otf b/test/api/fonts/cff1_encoding_many_codes.otf new file mode 100644 index 000000000..d94a0e784 Binary files /dev/null and b/test/api/fonts/cff1_encoding_many_codes.otf differ diff --git a/test/api/test-subset-cff1.c b/test/api/test-subset-cff1.c index d3d75e899..e6917d699 100644 --- a/test/api/test-subset-cff1.c +++ b/test/api/test-subset-cff1.c @@ -339,6 +339,30 @@ test_subset_cff1_retaingids (void) hb_face_destroy (face_ac); } +static void +test_subset_cff1_encoding_many_codes_retaingids (void) +{ + /* A format 1 encoding gives codes to 768 glyphs; with retain-gids + * the subset keeps more than 255 of them, too many for format 0. */ + hb_face_t *face = hb_test_open_font_file ("fonts/cff1_encoding_many_codes.otf"); + hb_face_t *face_expected = hb_test_open_font_file ("fonts/cff1_encoding_many_codes.300.retaingids.otf"); + + hb_set_t *glyphs = hb_set_create (); + hb_subset_input_t *input; + hb_face_t *face_subset; + hb_set_add (glyphs, 300); + input = hb_subset_test_create_input_from_glyphs (glyphs); + hb_subset_input_set_flags (input, HB_SUBSET_FLAGS_RETAIN_GIDS); + face_subset = hb_subset_test_create_subset (face, input); + hb_set_destroy (glyphs); + + hb_subset_test_check (face_expected, face_subset, HB_TAG ('C','F','F',' ')); + + hb_face_destroy (face_subset); + hb_face_destroy (face); + hb_face_destroy (face_expected); +} + static void test_subset_cff1_j_retaingids (void) { @@ -489,6 +513,7 @@ main (int argc, char **argv) hb_test_add (test_subset_cff1_dotsection); hb_test_add (test_subset_cff1_retaingids); hb_test_add (test_subset_cff1_j_retaingids); + hb_test_add (test_subset_cff1_encoding_many_codes_retaingids); hb_test_add (test_subset_cff1_identity_charset); hb_test_add (test_subset_cff1_j_identity_charset); diff --git a/test/fuzzing/fonts/99215ba41ff85c26926e866883e0fa4239556f9d b/test/fuzzing/fonts/99215ba41ff85c26926e866883e0fa4239556f9d new file mode 100644 index 000000000..fdd0d5938 Binary files /dev/null and b/test/fuzzing/fonts/99215ba41ff85c26926e866883e0fa4239556f9d differ