mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 22:11:04 +01:00
cff2_subset_plan::create() cast acc.fdSelect (a CFF2FDSelect) to the CFF1 FDSelect type for hb_plan_subset_cff_fdselect(), whose get_fd_range() dispatch knows only formats 0 and 3. A CFF2-only format-4 FDSelect therefore reported FD 0 for every glyph, so the planner kept only Font DICT 0: every retained glyph belonging to another Font DICT lost that DICT's Private DICT and local subrs, and when it called a local subr it either lost its outline or drew through FD 0's subrs with the wrong shape. The call still succeeded, writing a single-Font-DICT font. Format 4 is the only FDSelect format with a 16-bit FD index, so every CFF2 font with more than 256 Font DICTs is affected. The planner only needs get_fd_range() and format, so give CFF2FDSelect its own get_fd_range() dispatching formats 0, 3 and 4, make hb_plan_subset_cff_fdselect a template over the FDSelect type with explicit instantiations for CFF1FDSelect and CFF2FDSelect (same pattern as other explicitly instantiated subset helpers), and drop the cast. The existing format-4 writer in hb_serialize_cff_fdselect is now reachable. Because a CFF2 font with >256 retained FDs can now legitimately plan format 4, serialize_cff2_to_cff1() rejects that case (CFF1 has no format 4) instead of emitting an invalid CFF table; with fewer FDs the downgrade is unchanged. Adds test_subset_cff2_fdselect_format4, which subsets the format-3 and format-4 variants of a two-Font-DICT font and requires identical CFF2 output and glyph 2's extents; it fails before this change. Reported by Anthropic's OSS Scanner as ordinary bug ANT-2026-7RSDR0F0. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>