mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 22:11:04 +01:00
cff1_subset_plan renumbers every custom SID it emits through sidmap (charset via plan_subset_charset, Top DICT names via reassignSIDs, FD names via sidmap[]), and the output String INDEX is serialized from that map. plan_subset_encoding was the one emitter that pushed the source font's SID unchanged into subset_enc_supp_codes, so once an earlier custom-named glyph was dropped a supplement code named the wrong glyph, or a string past the end of the renumbered String INDEX. Look the SID up in sidmap where the supplement entry is recorded. The source SID is still used for get_supplement_codes(), which searches the source Encoding. This is safe on every path that reaches it: subset_encoding implies a non-CID font, so plan_subset_charset has already added each visited glyph's name (sidmap.add is idempotent), and when the charset is predefined and plan_subset_charset is skipped all glyph SIDs are standard strings, which sidmap[] returns unchanged. Adds test_subset_cff1_encoding_supplement with a generated CFF font (custom names, format-0 Encoding with supplement 98 -> 'second') and its expected B,C subset; the test fails before this change. Reported by Anthropic's OSS Scanner as ordinary bug ANT-2026-JORVXUQZ. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
212 B
212 B