mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-21 06:51:01 +01:00
[subset] Bound default UVS ranges to 256 codepoints (#6317)
The dense DefaultUVS copy path merged adjacent source ranges without respecting additionalCount's 8-bit limit. Subsetting 257 consecutive default UVS mappings could leave only one mapping after count truncation. Start a new range before the additional count overflows. Exercise cmap formats 14 and 15 at 1, 255, 256, 257, 512, 513, and 768 mappings, checking both the retained mapping count and the last variation glyph. Built with C++11 and ran the complete Meson suite: 279 passed. Assisted-by: OpenAI Codex
This commit is contained in:
1 parent
152313c8cc
commit
3c4d303c70
2 files changed
+63
-1
No files matched your search
@@ -1147,7 +1147,7 @@ struct DefaultUVS : SortedArray32Of<UnicodeValueRange>
|
||||
count += 1;
|
||||
if (lastCode == HB_SET_VALUE_INVALID)
|
||||
lastCode = curEntry;
|
||||
else if (lastCode + count != curEntry)
|
||||
else if (lastCode + count != curEntry || count > 255)
|
||||
{
|
||||
UnicodeValueRange rec;
|
||||
rec.startUnicodeValue = lastCode;
|
||||
|
||||
@@ -49,6 +49,66 @@ test_subset_cmap (void)
|
||||
hb_face_destroy (face_ac);
|
||||
}
|
||||
|
||||
static void
|
||||
check_default_uvs_range_limit (unsigned int format)
|
||||
{
|
||||
static const char maxp_data[] = {0, 0, 0x50, 0, 3, 1};
|
||||
char cmap_data[] = {
|
||||
0, 0, 0, 2, /* cmap header */
|
||||
0, 0, 0, 5, 0, 0, 0, 48, /* UVS encoding record */
|
||||
0, 3, 0, 10, 0, 0, 0, 20, /* nominal encoding record */
|
||||
0, 12, 0, 0, 0, 0, 0, 28, /* format 12 header */
|
||||
0, 0, 0, 0, 0, 0, 0, 1,
|
||||
0, 0, 0x10, 0, 0, 0, 0x12, (char) 0xFF, 0, 0, 0, 1,
|
||||
0, 14, 0, 0, 0, 37, 0, 0, 0, 1, /* format 14 or 15 header */
|
||||
0, (char) 0xFE, 0, 0, 0, 0, 21, 0, 0, 0, 0,
|
||||
0, 0, 0, 3, /* three adjacent 256-codepoint ranges */
|
||||
0, 0x10, 0, (char) 0xFF,
|
||||
0, 0x11, 0, (char) 0xFF,
|
||||
0, 0x12, 0, (char) 0xFF,
|
||||
};
|
||||
cmap_data[49] = format;
|
||||
hb_face_t *face = hb_face_builder_create ();
|
||||
HB_FACE_ADD_TABLE (face, "maxp", maxp_data);
|
||||
HB_FACE_ADD_TABLE (face, "cmap", cmap_data);
|
||||
|
||||
const unsigned int counts[] = {1, 255, 256, 257, 512, 513, 768};
|
||||
for (unsigned int i = 0; i < G_N_ELEMENTS (counts); i++)
|
||||
{
|
||||
hb_set_t *codepoints = hb_set_create ();
|
||||
hb_set_add_range (codepoints, 0x1000, 0x1000 + counts[i] - 1);
|
||||
hb_set_add (codepoints, 0xFE00);
|
||||
hb_face_t *subset = hb_subset_test_create_subset (
|
||||
face, hb_subset_test_create_input (codepoints));
|
||||
hb_set_clear (codepoints);
|
||||
hb_face_collect_variation_unicodes (subset, 0xFE00, codepoints);
|
||||
g_assert_cmpuint (hb_set_get_population (codepoints), ==, counts[i]);
|
||||
hb_font_t *font = hb_font_create (subset);
|
||||
hb_codepoint_t glyph;
|
||||
g_assert_true (hb_font_get_variation_glyph (font, 0x1000 + counts[i] - 1,
|
||||
0xFE00, &glyph));
|
||||
g_assert_cmpuint (glyph, ==, counts[i]);
|
||||
hb_font_destroy (font);
|
||||
hb_set_destroy (codepoints);
|
||||
hb_face_destroy (subset);
|
||||
}
|
||||
hb_face_destroy (face);
|
||||
}
|
||||
|
||||
static void
|
||||
test_subset_cmap_default_uvs_range_limit (void)
|
||||
{
|
||||
check_default_uvs_range_limit (14);
|
||||
}
|
||||
|
||||
#ifndef HB_NO_BEYOND_64K
|
||||
static void
|
||||
test_subset_cmap15_default_uvs_range_limit (void)
|
||||
{
|
||||
check_default_uvs_range_limit (15);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
test_subset_cmap_non_consecutive_glyphs (void)
|
||||
{
|
||||
@@ -357,6 +417,7 @@ main (int argc, char **argv)
|
||||
|
||||
hb_test_add (test_subset_cmap);
|
||||
hb_test_add (test_subset_cmap_noop);
|
||||
hb_test_add (test_subset_cmap_default_uvs_range_limit);
|
||||
hb_test_add (test_subset_cmap_non_consecutive_glyphs);
|
||||
hb_test_add (test_subset_cmap4_no_exceeding_maximum_codepoint);
|
||||
hb_test_add (test_subset_cmap_empty_tables);
|
||||
@@ -365,6 +426,7 @@ main (int argc, char **argv)
|
||||
hb_test_add (test_subset_DMAP);
|
||||
#ifndef HB_NO_BEYOND_64K
|
||||
hb_test_add (test_subset_cmap_format15);
|
||||
hb_test_add (test_subset_cmap15_default_uvs_range_limit);
|
||||
#endif
|
||||
|
||||
return hb_test_run();
|
||||
|
||||
Reference in new issue
Block a user