Commit Graph
16522 Commits
Author SHA1 Message Date
Garret Rieger ea78736648 Fix OOB access in _hb_ft_color_line_get_color_stops. (#6121)
Input count is not being respected when writing output. Also fixes potential infinite loop.
2026-07-30 15:45:35 -06:00
Behdad Esfahbod 12b686dad7 [shape] Limit syllable length (#6120)
Unbounded syllables can make the USE and Myanmar reordering passes
perform quadratic work. Process syllables in configurable chunks of at
most 64 glyphs to bound the work performed by each reordering pass.

Fixes: https://github.com/harfbuzz/harfbuzz/issues/6118
Assisted-by: Codex <codex@openai.com>
2026-07-30 15:44:57 -06:00
Behdad Esfahbod c7ed9fe764 [ot] Bound Condition sanitization recursion (#6119)
Route Condition sanitization through the dispatch machinery under the
sanitize context's standard nesting limit.  Make the condition format
sanitizers public so the sanitize context can dispatch to them.

Fixes: https://github.com/harfbuzz/harfbuzz/issues/6116
Assisted-by: OpenAI Codex
2026-07-30 15:17:41 -06:00
Behdad Esfahbod dcb18ae6d0 Merge pull request #5767 from harfbuzz/avar2-instancing
Avar2 instancing
2026-07-30 14:50:34 -06:00
Khaled Hosny 6b6f0d9770 [GPOS] Apply mark-attachment cross-direction offsets immediately
Fixes https://github.com/harfbuzz/harfbuzz/issues/4596

See the issue for more details.

Instead of deferring mark positioning to the end of GPOS application, we
now apply cross-direction offsets (y-direction in horizontal text)
immediately and keep applying main-direction (x-direction in horizontal
text) as before.

This is still not 100% compatible with DirectWrite or Core Text (they
apply both directions immediately), but enough to fix the reported
issue.

Based on Behdad’s patch below, but fixes the Noto Nastaliq regression by
resolving the base offset through the whole cursive attachment chain
since cursive offsets are relative the previous glyph and get finalized
only at end of GPOS:
https://github.com/harfbuzz/harfbuzz/issues/4596#issuecomment-2276300688

The remaining failure is not a regression, the new expectation now match
DirectWrite and Core Text.

The tests include a subsetted bug font, as well as two constructed fonts
where curs lookup come before mark ones, once with kern before mark and
with kern after mark, to show that lookup order affects y but not
x-direction.
2026-07-30 23:27:22 +03:00
Behdad Esfahbod 14a2f6aa93 [subset] Reuse serializers for avar2 variation data
Build a DeltaSetIndexMap serialization plan for the retained axes and use
the existing DeltaSetIndexMap and ItemVariationStore serializers.

This replaces the duplicate manual encoding and object-linking logic while
preserving NO_VARIATION_INDEX entries and retained-axis ordering.

Tests: meson test -C build

Assisted-by: OpenAI Codex
2026-07-30 12:44:17 -06:00
Behdad Esfahbod a518a0e535 [subset] Deduplicate avar2 instancing state
Reuse old_intermediates for avar2 segment-map renormalization and IVS
rebasing instead of maintaining an identical plan map.

Fold the v1-only mapping and deferred region-list paths into their
existing helpers, and update the design notes to match.

Tests: meson test -C build

Assisted-by: OpenAI Codex
2026-07-30 12:43:52 -06:00
Behdad Esfahbod 7d752d66c7 [subset] Propagate avar2 planning failures
Treat missing axis mappings, invalid variation rows, and allocation
failures as hard errors instead of silently weakening culling or
skipping offset compensation.

Also propagate dead-region collection failures through ItemVariationStore
subsetting.

Tests: meson test -C build

Assisted-by: OpenAI Codex
2026-07-30 12:34:27 -06:00
Behdad Esfahbod 23a0aa4746 Merge branch 'main' into avar2-instancing 2026-07-30 12:20:25 -06:00
Behdad Esfahbod 3f003edf5c [subset] Fix msvc bot 2026-07-30 12:00:47 -06:00
Behdad Esfahbod 9af18b22f4 Merge pull request #6113 from behdad/codex-review-pr-5733
Dependency Graph Review Fixes
2026-07-30 12:00:42 -06:00
Behdad Esfahbod 07b0407cc7 Merge pull request #6098 from harfbuzz/marklig-multiple-subst
Fix mark attachments after decomposition then ligation
2026-07-30 11:57:18 -06:00
Behdad Esfahbod 0b07c784f8 [subset/gsubgpos] Fix sentinel value clash 2026-07-30 11:45:30 -06:00
Behdad Esfahbod c5eda499b4 Merge branch 'main' into codex-review-pr-5733 2026-07-30 11:40:20 -06:00
Behdad Esfahbod df5ce0d587 [config] Remove obsolete HB_SUBSET_DEPEND_API 2026-07-30 11:18:06 -06:00
Behdad Esfahbod 5ce238e297 [subset-serialize] Fix include 2026-07-30 11:16:45 -06:00
Behdad Esfahbod 25fc94439a Merge pull request #5733 from skef/depend-draft-pr
OpenType font dependency graph support
2026-07-30 11:12:48 -06:00
Behdad Esfahbod d8617e1e91 Fix an API nullable crash
Fixes https://github.com/harfbuzz/harfbuzz/issues/6112
2026-07-30 10:49:20 -06:00
Shubham Gupta 5b54d30ce7 hardcoded version string to lock shared library object name for aix platform 2026-07-29 20:33:19 +03:00
Behdad Esfahbod f26e0cd4ed [instancer] Fix HVAR partial instancing for map-less advance mappings (#6070)
* [instancer] Don't dedup VarStore rows when not optimizing

as_item_varstore dropped duplicate delta rows even with optimize=false,
where varidx_map is left empty and callers rely on original
VariationIndex values staying valid.  HVAR/VVAR subsetting uses that
mode when the source table has an implicit (map-less) advance mapping:
any two glyphs sharing identical deltas shifted every following row, so
the synthesized identity map pointed at wrong rows and past the end of
the VarData — advances silently froze or took neighbors' deltas when
partially instancing such fonts (e.g. Source Han fonts).

Fixes https://github.com/harfbuzz/harfbuzz/issues/6068

* [subset] Drop identity advance maps for map-less HVAR/VVAR sources

When the source table uses implicit glyph-id indexing, the subsetter
synthesized an advance DeltaSetIndexMap whose content was the identity
over every output glyph — equivalent to the implicit indexing it
replaced, just bigger.  Recognize that case in is_identity () and keep
the output map-less, like fontTools does.  Sources that carry a real
map keep one, preserving their form; truncated maps don't qualify since
glyphs past their end share the last value.

retain-num-glyphs expected files regenerated: NotoSansJP-VF.subset.otf
is map-less, and its redundant identity map is now dropped (verified
against fontTools output).

* [test/subset] Test partial instancing of map-less HVAR

ImplicitHVAR.ttf carries an HVAR with implicit (map-less) advance
indexing and deliberately duplicated delta rows, the combination that
broke before the row-dedup fix: rows shifted or fell off the end of the
rebuilt VarData and advances silently froze.  Expected outputs are
cross-checked against fontTools varLib.instancer + subset.
2026-07-29 11:29:23 -06:00
nussaibah shaikh 8c9307b59a [raster] clamp coordinates before converting to int (#6090)
* [raster] clamp coordinates before converting to int

the transformed glyph extents and the flattened segment endpoints are floats derived from int32 inputs and can land far outside the int range, so the conversions were undefined and the extent subtraction overflowed on top of that. saturate through a shared helper and widen the subtraction.

* [raster] generalize int32 saturating cast into hb_clamp_to<>

Move the raster-local hb_raster_clamp_to_int32 helper into hb-algs.hh
as a generic hb_clamp_to<T> that saturates a floating-point value to
the range of any integer type, and use hb_clamp_to<int32_t> at the
three raster call sites.

Signed-off-by: nussaiba shaikh <nussaibah@bugqore.com>

---------

Signed-off-by: nussaiba shaikh <nussaibah@bugqore.com>
2026-07-29 02:59:29 -06:00
Behdad Esfahbod da7f951ef0 Add more hb_barrier()s in switches (#6106)
Fixes https://github.com/harfbuzz/harfbuzz/security/advisories/GHSA-pmg2-m89x-pc6j
2026-07-27 19:20:18 -06:00
Khaled Hosny f3dea1e602 [subset] Add HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET
When set and subsetting a CID-keyed CFF font, the output charset is
written as identity: CID = new GID.
2026-07-27 22:12:16 +03:00
nussaibah shaikh 884f5a7991 [subset] guard scalars resize in cff2-to-cff1 blend encoder (#6093) 2026-07-27 10:59:22 -06:00
Behdad Esfahbod 72c6c3c757 [MSVC] Suppress another unused-var warning
Fixes https://github.com/harfbuzz/harfbuzz/issues/6095
2026-07-27 10:56:27 -06:00
Behdad Esfahbod c2b72d76d8 [buffer-verify] Fix OOM condition typo
Fixes https://github.com/harfbuzz/harfbuzz/issues/6097
2026-07-26 17:05:29 -06:00
Thalha Ahmed 34baf8d4cd Add hb_malloc2/hb_realloc2 for overflow-checked array allocation (#6099)
Add internal ALWAYS_INLINE helpers hb_malloc2(nmemb, size) and
hb_realloc2(ptr, nmemb, size) in hb-algs.hh that check for
multiplication overflow before calling hb_malloc/hb_realloc.

Convert call sites that had unchecked n * sizeof(T) multiplications:
  - src/OT/glyf/glyf-helpers.hh
  - src/hb-cairo-utils.cc
  - src/hb-gpu-paint.cc
  - src/hb-map.hh
  - src/hb-ot-post-table.hh
  - src/hb-shape.cc

Also fix raw malloc/free in src/main.cc to use hb_malloc/hb_free.
2026-07-26 11:19:11 -06:00
Khaled Hosny 6cc6d89e05 [GPOS] Count decomposed pieces as one ligature component
Non-first pieces of a MultipleSubst now add no extra component, so a
decomposed glyph absorbed into a ligature counts as the single component
it started as, and its marks attach where MarkBasePos would.

Part of https://github.com/harfbuzz/harfbuzz/issues/4969
2026-07-25 13:35:41 +03:00
Khaled Hosny a49431bcf9 [GPOS] Attach mark to first component of MultipleSubst in MarkLigPos
Do what MarkBasePos already does, so the backward search skips the
leftover pieces of a decomposition instead of giving up on them.

Fixes https://github.com/harfbuzz/harfbuzz/issues/4969
2026-07-25 13:35:28 +03:00
Hanyu Wang d65aa90ea6 [buffer] Set content_type only for the format actually being parsed (#6092)
hb_buffer_deserialize_unicode() and hb_buffer_deserialize_glyphs() each
mutated the buffer's content_type unconditionally before checking
whether the caller-supplied format was recognized, then returned false
without rolling that back for an invalid format. A buffer left with
content_type set but len == 0 fails the assert_glyphs() /
assert_unicode() invariant on a later, independent call that expects
a clean buffer, aborting the process:

  - deserialize_unicode(INVALID) -> deserialize_glyphs() aborts in
    assert_glyphs().
  - deserialize_glyphs(INVALID) -> add_codepoints() aborts in
    assert_unicode().

Move each hb_buffer_set_content_type() call into the TEXT/JSON case
bodies of the existing format switch, instead of guarding it with a
separate validity check ahead of the switch. The switch's own case
list is already the single source of truth for which formats are
supported, so this avoids duplicating that knowledge in a second
condition that could drift out of sync with the switch.

Testing:
  - Built with -Db_sanitize=address,undefined.
  - Reproduced both original aborts against the unfixed code
    (SIGABRT via assert_glyphs()/assert_unicode()).
  - Rebuilt with the fix and reran both reproducers: clean exit, no
    assertion failure.
  - Ran the full test suite (meson test, sanitizer build, FreeType +
    ICU enabled) before and after: 71/75 pass in both, with the same
    4 pre-existing failures unrelated to buffer serialization
    (check-libstdc++, and the experimental vector/raster/gpu-fuzzer
    chunk 2 targets) - confirmed to fail identically on the
    unmodified baseline, so no regressions from this change.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-24 15:35:58 -06:00
Sai Asish Y cce964cb4f [ot-tag] guard against NULL language in hb_ot_tags_to_script_and_language (#6085)
hb_ot_tag_to_language returns NULL for HB_OT_TAG_DEFAULT_LANGUAGE, and hb_language_to_string returns NULL for it, so the script-suffix path called strlen on a NULL pointer whenever the primary script tag did not match the input. Skip the suffix construction when there is no base language string and leave the default (NULL) language in place.

Signed-off-by: Sai Asish Y <say.apm35@gmail.com>
2026-07-21 18:47:36 -06:00
nussaibah shaikh 53900fd388 [gpu] bound clip depth in push_clip_path_end (#6073)
push_clip_path_end wrote clip_stack[clip_depth] without the
HB_GPU_PAINT_MAX_CLIP_DEPTH check that push_clip_glyph and
push_clip_path_start both apply. clip_depth can be pushed past
the fixed 3-entry clip_stack, so closing a clip path while the
stack is full writes a pending_clip_t past the array. Guard it
like the sibling clip pushes.
2026-07-21 18:45:53 -06:00
nussaibah shaikh 387ab23f7f [raster] Reject non-finite texel coords in hb_raster_paint_image (#6082)
The range test guarding the bilinear sampler is comparison-based, so NaN
coordinates pass it and reach (int) floorf() in
hb_raster_sample_bilinear_premul, where only x1/y1 are clamped.  The
determinant guard has the same shape, so a transform that overflows to
infinity is accepted and 1/inf turns inf * 0 into NaN.
2026-07-21 18:40:41 -06:00
nussaibah shaikh 8b14f7b217 [colr] clamp alpha and radius deltas before unsigned conversion (#6087)
font-supplied F2DOT14 alpha and variable radius deltas can be negative,
and converting a negative float to unsigned is undefined behavior.
2026-07-21 18:38:27 -06:00
Behdad Esfahbod 38976fba5c [config] Never set HB_NO_CFF here
It was affecting subsetting library unintentionally.

https://github.com/harfbuzz/harfbuzz/pull/6009#issuecomment-4988163042
2026-07-21 14:53:15 -06:00
Qunxin Liu 2c875edbb6 [subset-repack] bug fixes (#6088)
* [subset-repack] fix potential out of bounds accesses

make sure we create a deep copy of the object before we mutate

* [subset-repack] fix is_shared(): only check real parents

* [subset-repack] add tests

* [subset-repack] apply AI proposed change

* address review comments

* [subset-repack] no need to duplicate shared liga_sets beforehand

Since we now would create a memory copy of the object before mutating
it, I think checking and duplicating shared liga_sets is not needed.
2026-07-21 11:49:06 -06:00
Qunxin Liu 8207419e0a [subset-repack] increase REPACKER_MAX_VERTICES limit to 800000 2026-07-21 11:16:26 -06:00
Behdad Esfahbod fc85680fec Revert "[subset-repack] bug fixes (#6077)"
This reverts commit 0b590d6b54.
2026-07-21 10:59:48 -06:00
Qunxin Liu 0b590d6b54 [subset-repack] bug fixes (#6077)
* [subset-repack] fix potential out of bounds accesses

make sure we create a deep copy of the object before we mutate

* [subset-repack] fix is_shared(): only check real parents

* [subset-repack] add tests

* [subset-repack] apply AI proposed change

* address review comments

* [subset-repack] no need to duplicate shared liga_sets beforehand

Since we now would create a memory copy of the object before mutating
it, I think checking and duplicating shared liga_sets is not needed.
2026-07-21 10:55:43 -06:00
Khaled Hosny 53d292f0d1 [introspection] Fix introspection warnings
Fixes https://github.com/harfbuzz/harfbuzz/issues/4875
2026-07-20 13:26:30 +03:00
Khaled Hosny 6fa49d36f0 [docs] Fix reference to non-existent hb_face_create_from_blob_or_fail 2026-07-20 13:26:05 +03:00
Nussu06 af192b7e0f [gpu] Validate extents fit i16 before quantizing 2026-07-18 07:26:32 -06:00
Nussu06 1737bce456 [subset] bound cvar tuple data length in calculate_cvt_deltas 2026-07-18 07:25:19 -06:00
Nussu06 9de7e9d563 [paint] pass color_glyph its own user_data
The dispatch wrapper handed the callback user_data->push_clip_glyph
instead of user_data->color_glyph, so a client registering both
callbacks with different contexts got the wrong pointer on every
COLR glyph.
2026-07-17 11:43:34 -06:00
Qunxin Liu af85ffc449 [subset] increase HB_MAX_FEATURE_INDICES limit to 8000
A realistic font file reaches 1512 feature indices, so increase the max
limit
2026-07-15 11:05:53 -06:00
Garret Rieger d7861576ae More fixes for review comments. 2026-07-14 16:26:49 -06:00
Garret Rieger 2725565dab Address review comments. 2026-07-14 16:26:49 -06:00
Garret Rieger 99380f0e44 Add new hb_subset_input_to_command_line_or_fail().
This generates an equivalent hb-subset command line string for a given subset input.

Assisted by gemini.
2026-07-14 16:26:49 -06:00
Behdad Esfahbod 946901f88d [svg] Use ISALNUM, not isalnum 2026-07-14 16:00:07 -06:00
Behdad Esfahbod 4fbbe7ae4f [ot-font] Invalidate vertical origin cache on scale change
The vertical-origin cache stores scaled y-origin values, but it was
validated against serial_coords. Changing only the font scale leaves
serial_coords unchanged, so hb_font_set_scale() could keep serving stale
vertical origins.

Validate scale-dependent OT font caches against the full font serial and
check that serial before using the batched vertical-origin callback. Add
an API regression that changes y_scale on one font and verifies the
vertical origin is recomputed.

Testing:
meson compile -C build test/api/test-ot-face
meson test -C build test-ot-face --print-errorlogs
meson test -C build --suite api --print-errorlogs

Fixes: https://github.com/harfbuzz/harfbuzz/issues/6066
Assisted-by: OpenAI Codex
2026-07-14 14:02:38 -06:00