From 37015a232678260171490897c07a4fde7353c655 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 7 Jun 2026 23:39:25 +0200 Subject: [PATCH 001/112] [util] Inhibit help2man usage on crossbuilds --- util/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/meson.build b/util/meson.build index baed2693b..d7b50dbbd 100644 --- a/util/meson.build +++ b/util/meson.build @@ -28,7 +28,7 @@ hb_subset_cli_sources = [ # If found, invoke it on our four binaries to build man pages # If not found, just skip this step -if not get_option('docs').disabled() +if not get_option('docs').disabled() and not meson.is_cross_build() help2man = find_program('help2man', required: false) else help2man = disabler() From 30a8ab86f8685ca40692d0e25c32d8c047be3974 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 7 Jun 2026 23:58:36 +0200 Subject: [PATCH 002/112] Follow up to PR 6020 [util] Fix Unicode command line arguments on Windows (#6022) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [util] Fix Unicode command line arguments on Windows GLib g_option_context_parse() converts argv strings from the system ACP via g_locale_to_utf8(), but Windows cmd deliver arguments encoded in the system codepage (ex: CP1252), which cannot represent most Unicode codepoints. This caused non ascii character to be corrupted For example, for this command, it rendered garbage instead of the emoji: ``` hb-view.exe "C:\Windows\Fonts\seguiemj.ttf" "😋" --output-file=output.png ``` Fix this in all util binaries (hb-ft-raster, hb-info, hb-raster, hb-shape, hb-subset, hb-vector, hb-view) by: 1. Calling g_win32_get_command_line() to obtain correctly UTF-8-encoded arguments from GetCommandLineW(). 2. Parsing with g_option_context_parse_strv() which skips the g_locale_to_utf8() conversion for G_OPTION_ARG_STRING entries. 3. Adding G_OPTION_FLAG_FILENAME to the G_OPTION_REMAINING callback entry in main-font-text.hh, so the callback path also skips the locale conversion in strv_mode (see https://gitlab.gnome.org/GNOME/glib/-/blob/8ef2f3ad402daf9fb94615ddef63ceef978fd76f/glib/goption.c#L1305). * [util] Fix Windows UTF-8 argv parsing On Windows, GLib's option parser treats argv as encoded in the system codepage and converts strings with g_locale_to_utf8(). The utilities need to parse the UTF-8 command line obtained from GetCommandLineW() instead, otherwise non-ASCII arguments can be corrupted before reaching the tool logic. Add a small argv_t wrapper for utility entry points to replace argv with g_win32_get_command_line() on Windows, and use the strv parser there so GLib skips the top-level argv conversion. Mark remaining callback arguments as filenames so GLib also skips callback argument conversion for positional text and font arguments. Testing: meson test -C build Assisted-by: OpenAI Codex * [mingw] Update instructions --------- Co-authored-by: moi15moi --- README.mingw.md | 12 ++++++++---- util/hb-ft-raster.cc | 3 ++- util/hb-gpu.cc | 3 ++- util/hb-info.cc | 5 +++-- util/hb-raster.cc | 3 ++- util/hb-shape.cc | 3 ++- util/hb-subset.cc | 5 +++-- util/hb-vector.cc | 3 ++- util/hb-view.cc | 3 ++- util/main-font-text.hh | 2 +- util/options.hh | 44 ++++++++++++++++++++++++++++++++++++++++-- 11 files changed, 69 insertions(+), 17 deletions(-) diff --git a/README.mingw.md b/README.mingw.md index 4f7163e99..a67101259 100644 --- a/README.mingw.md +++ b/README.mingw.md @@ -119,10 +119,14 @@ You can make Wine less verbose, without hiding all errors, by setting: Add this to your `.bashrc` or `.zshrc` file as well. -Next, let's try some non-Latin text. Unfortunately, the command-line parsing of -our cross-compiled glib is not quite Unicode-aware, at least when run under -Wine. So you will need to find some other way to feed Unicode text to the -shaper. There are three different ways you can try: +Next, let's try some non-Latin text. You can pass Unicode text to the commands +and they /should/ just work: + + - `wine build-win/util/hb-shape.exe perf/fonts/Amiri-Regular.ttf حرف` + +If not, there are other ways to pass them to the commands that do not involve +parsing Unicode-aware command-line arguments. There are three different ways +you can try: - `echo حرف | wine build-win/util/hb-shape.exe perf/fonts/Amiri-Regular.ttf` - `wine build-win/util/hb-shape.exe perf/fonts/Amiri-Regular.ttf -u 062D,0631,0641` diff --git a/util/hb-ft-raster.cc b/util/hb-ft-raster.cc index d1d877f39..1c55375cc 100644 --- a/util/hb-ft-raster.cc +++ b/util/hb-ft-raster.cc @@ -332,5 +332,6 @@ int main (int argc, char **argv) { using main_t = main_font_text_t, font_options_t, shape_text_options_t>; - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/hb-gpu.cc b/util/hb-gpu.cc index d73666844..2645e2d4d 100644 --- a/util/hb-gpu.cc +++ b/util/hb-gpu.cc @@ -183,6 +183,7 @@ struct gpu_main_t : base_t int main (int argc, char **argv) { + argv_t args (argc, argv); gpu_main_t driver; - return driver (argc, argv); + return driver (args.argc, args.argv); } diff --git a/util/hb-info.cc b/util/hb-info.cc index 197ce3b58..d5a8292ba 100644 --- a/util/hb-info.cc +++ b/util/hb-info.cc @@ -143,7 +143,7 @@ struct info_t : GOptionEntry entries[] = { {"quiet", 'q', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &this->verbose, "Generate machine-readable output", nullptr}, - {G_OPTION_REMAINING, 0, G_OPTION_FLAG_IN_MAIN, + {G_OPTION_REMAINING, 0, G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, (gpointer) &collect_rest, nullptr, "[FONT-FILE]"}, {nullptr} }; @@ -1437,5 +1437,6 @@ retry: int main (int argc, char **argv) { - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/hb-raster.cc b/util/hb-raster.cc index 7d70594a9..31a0e8cc0 100644 --- a/util/hb-raster.cc +++ b/util/hb-raster.cc @@ -38,5 +38,6 @@ int main (int argc, char **argv) { using main_t = main_font_text_t, font_options_t, shape_text_options_t>; - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/hb-shape.cc b/util/hb-shape.cc index 9eec5636a..4c7032b0a 100644 --- a/util/hb-shape.cc +++ b/util/hb-shape.cc @@ -39,5 +39,6 @@ int main (int argc, char **argv) { using main_t = main_font_text_t, font_options_t, shape_text_options_t>; - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/hb-subset.cc b/util/hb-subset.cc index 8c6058de5..09fd73ef6 100644 --- a/util/hb-subset.cc +++ b/util/hb-subset.cc @@ -1023,7 +1023,7 @@ subset_main_t::add_options () GOptionEntry entries[] = { - {G_OPTION_REMAINING, 0, G_OPTION_FLAG_IN_MAIN, + {G_OPTION_REMAINING, 0, G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, (gpointer) &collect_rest, nullptr, "[FONT-FILE] [TEXT]"}, {nullptr} }; @@ -1034,5 +1034,6 @@ subset_main_t::add_options () int main (int argc, char **argv) { - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/hb-vector.cc b/util/hb-vector.cc index a042ebc92..89e3650a8 100644 --- a/util/hb-vector.cc +++ b/util/hb-vector.cc @@ -36,5 +36,6 @@ int main (int argc, char **argv) { using main_t = main_font_text_t, font_options_t, shape_text_options_t>; - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/hb-view.cc b/util/hb-view.cc index 604976e1e..83d823221 100644 --- a/util/hb-view.cc +++ b/util/hb-view.cc @@ -39,5 +39,6 @@ int main (int argc, char **argv) { using main_t = main_font_text_t, font_options_t, shape_text_options_t>; - return batch_main (argc, argv); + argv_t args (argc, argv); + return batch_main (args.argc, args.argv); } diff --git a/util/main-font-text.hh b/util/main-font-text.hh index 01219dc2f..d32a71f50 100644 --- a/util/main-font-text.hh +++ b/util/main-font-text.hh @@ -70,7 +70,7 @@ struct main_font_text_t : GOptionEntry entries[] = { - {G_OPTION_REMAINING, 0, G_OPTION_FLAG_IN_MAIN, + {G_OPTION_REMAINING, 0, G_OPTION_FLAG_IN_MAIN | G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, (gpointer) &collect_rest, nullptr, "[FONT-FILE] [TEXT]"}, {nullptr} }; diff --git a/util/options.hh b/util/options.hh index dd335fde7..83cef2563 100644 --- a/util/options.hh +++ b/util/options.hh @@ -56,7 +56,6 @@ #include #include - enum return_value_t { RETURN_VALUE_SUCCESS = 0, @@ -68,6 +67,33 @@ enum return_value_t static inline void fail (hb_bool_t suggest_help, const char *format, ...) G_GNUC_NORETURN G_GNUC_PRINTF (2, 3); +struct argv_t +{ + argv_t (int argc_, char **argv_) + : argc (argc_), argv (argv_) + { +#ifdef G_OS_WIN32 + argv_utf8 = g_win32_get_command_line (); + argc = (int) g_strv_length (argv_utf8); + argv = argv_utf8; +#endif + } + + ~argv_t () + { +#ifdef G_OS_WIN32 + g_strfreev (argv_utf8); +#endif + } + + int argc; + char **argv; + +#ifdef G_OS_WIN32 + gchar **argv_utf8 = nullptr; +#endif +}; + static inline void fail (hb_bool_t suggest_help, const char *format, ...) { @@ -266,7 +292,21 @@ option_parser_t::parse (int *argc, char ***argv, bool ignore_error) set_full_description (); GError *parse_error = nullptr; - if (!g_option_context_parse (context, argc, argv, &parse_error)) + bool parse_ok; +#ifdef G_OS_WIN32 + /* g_option_context_parse() on Windows converts argv from the ACP via + * g_locale_to_utf8(), but argv is already in UTF-8. + * Use g_option_context_parse_strv() to skip the locale conversion. */ + gchar **win32_argv = g_new (gchar *, *argc + 1); + for (int i = 0; i < *argc; i++) + win32_argv[i] = g_strdup ((*argv)[i]); + win32_argv[*argc] = nullptr; + parse_ok = g_option_context_parse_strv (context, &win32_argv, &parse_error); + g_strfreev (win32_argv); +#else + parse_ok = g_option_context_parse (context, argc, argv, &parse_error); +#endif + if (!parse_ok) { if (parse_error) { From b582759c0d55386d40b3431594b9ed0439ae50f5 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 2 Jun 2026 17:13:44 +0300 Subject: [PATCH 003/112] [ot-layout] Fix docs typo These function take a font not face as input. --- src/hb-ot-layout.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index c11d0e465..ecd511cbd 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -2288,7 +2288,7 @@ hb_ot_layout_get_horizontal_baseline_tag_for_script (hb_script_t script) * @language_tag: language tag, currently unused. * @coord: (out) (nullable): baseline value if found. * - * Fetches a baseline value from the face. + * Fetches a baseline value from the font. * * Return value: `true` if found baseline value in the font. * @@ -2314,7 +2314,7 @@ hb_ot_layout_get_baseline (hb_font_t *font, * @language: (nullable): language, currently unused. * @coord: (out) (nullable): baseline value if found. * - * Fetches a baseline value from the face. + * Fetches a baseline value from the font. * * This function is like hb_ot_layout_get_baseline() but takes * #hb_script_t and #hb_language_t instead of OpenType #hb_tag_t. @@ -2350,7 +2350,7 @@ hb_ot_layout_get_baseline2 (hb_font_t *font, * @language_tag: language tag, currently unused. * @coord: (out): baseline value if found. * - * Fetches a baseline value from the face, and synthesizes + * Fetches a baseline value from the font, and synthesizes * it if the font does not have it. * * Since: 4.0.0 @@ -2572,7 +2572,7 @@ hb_ot_layout_get_baseline_with_fallback (hb_font_t *font, * @language: (nullable): language, currently unused. * @coord: (out): baseline value if found. * - * Fetches a baseline value from the face, and synthesizes + * Fetches a baseline value from the font, and synthesizes * it if the font does not have it. * * This function is like hb_ot_layout_get_baseline_with_fallback() but takes From 4937609f3951a99fa999a64357c31464ddc57ce4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 10:12:57 +0000 Subject: [PATCH 004/112] Bump actions/checkout from 6.0.2 to 6.0.3 Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/de0fac2e4500dabe0009e67214ff5f5447ce83dd...df4cb1c069e1874edd31b4311f1884172cec0e10) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/arm.yml | 2 +- .github/workflows/c++-versions.yml | 2 +- .github/workflows/configs-build.yml | 2 +- .github/workflows/coverity-scan.yml | 2 +- .github/workflows/crossbuild-mingw.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/linux.yml | 4 ++-- .github/workflows/macos.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/msys2.yml | 2 +- .github/workflows/rust.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- .github/workflows/scorecard.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/arm.yml b/.github/workflows/arm.yml index 11d69114a..ca43192de 100644 --- a/.github/workflows/arm.yml +++ b/.github/workflows/arm.yml @@ -15,7 +15,7 @@ jobs: container: image: devkitpro/devkitarm:latest steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Configure CMake run: | cmake -S . -B build \ diff --git a/.github/workflows/c++-versions.yml b/.github/workflows/c++-versions.yml index 6d1350148..c4ce3a902 100644 --- a/.github/workflows/c++-versions.yml +++ b/.github/workflows/c++-versions.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Install Dependencies run: | sudo apt-get update diff --git a/.github/workflows/configs-build.yml b/.github/workflows/configs-build.yml index 92bf3f8ed..7bacbd773 100644 --- a/.github/workflows/configs-build.yml +++ b/.github/workflows/configs-build.yml @@ -26,7 +26,7 @@ jobs: name: ${{ matrix.config }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Create main.cc run: | cat < main.cc diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 210a12150..92299d7f1 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -11,7 +11,7 @@ jobs: latest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - run: sudo apt-get install gcc clang wget git curl pkg-config libfreetype6-dev libglib2.0-dev libicu-dev libgraphite2-dev diff --git a/.github/workflows/crossbuild-mingw.yml b/.github/workflows/crossbuild-mingw.yml index 81b0212cd..a55595e8e 100644 --- a/.github/workflows/crossbuild-mingw.yml +++ b/.github/workflows/crossbuild-mingw.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies @@ -64,7 +64,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Download artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3d15a86b2..31003101d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 01dc6c4ff..37d7f9eb1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: @@ -82,7 +82,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Download artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5c336ac02..dababf3c9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 9570acd55..4ee8f8fe3 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 394e33e66..d12bd7d59 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -28,7 +28,7 @@ jobs: shell: msys2 {0} steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup MSYS2 uses: msys2/setup-msys2@cf96e00c0aab3788743aaf63b64146f0d383cee9 # v2 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d699e416b..0f8e0f1c3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index f43633981..9070ae7fc 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index b87fa176c..08337fd96 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -29,7 +29,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index e67d291ee..f9669c4aa 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies From 360a3024d49b6bd9b0e6a25a185dcb2d0a4ba96b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 10:13:11 +0000 Subject: [PATCH 005/112] Bump github/codeql-action from 4.36.0 to 4.36.2 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.36.0 to 4.36.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/7211b7c8077ea37d8641b6271f6a365a22a5fbfa...8aad20d150bbac5944a9f9d289da16a4b0d87c1e) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.36.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 08337fd96..ea0f13ce3 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v3.29.5 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5 with: sarif_file: results.sarif From 259cd490449c0e7bea0a78931301c164b3ab8a66 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 8 Jun 2026 18:19:32 +0200 Subject: [PATCH 006/112] [build] Drop empty translation units (#6025) GCC LTO can emit weak filename-derived placeholder symbols for empty translation units, and those symbols can leak from shared libraries on ELF builds. The stricter check-symbols test added for weak symbols then catches names such as hb_raster.cc.. Remove the empty hb-raster.cc and hb-subset-cff2-to-cff1.cc units from the build and tracked amalgamations. Move the raster section docs to hb-raster-image.cc, which remains part of the raster library. Testing: meson test -C build Fixes: https://github.com/harfbuzz/harfbuzz/issues/6021 Assisted-by: OpenAI Codex --- CMakeLists.txt | 1 - src/harfbuzz-subset.cc | 1 - src/harfbuzz-world.cc | 2 -- src/hb-raster-image.cc | 39 ++++++++++++++++++++ src/hb-raster.cc | 68 ----------------------------------- src/hb-subset-cff2-to-cff1.cc | 40 --------------------- src/meson.build | 2 -- 7 files changed, 39 insertions(+), 114 deletions(-) delete mode 100644 src/hb-raster.cc delete mode 100644 src/hb-subset-cff2-to-cff1.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ab88ef22..b5ab53946 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,6 @@ set (subset_project_headers ${PROJECT_SOURCE_DIR}/src/hb-subset-serialize.h ) set (raster_project_sources - ${PROJECT_SOURCE_DIR}/src/hb-raster.cc ${PROJECT_SOURCE_DIR}/src/hb-raster-image.cc ${PROJECT_SOURCE_DIR}/src/hb-raster-image.hh ${PROJECT_SOURCE_DIR}/src/hb-raster.hh diff --git a/src/harfbuzz-subset.cc b/src/harfbuzz-subset.cc index 616c244a1..f6a5a319c 100644 --- a/src/harfbuzz-subset.cc +++ b/src/harfbuzz-subset.cc @@ -54,7 +54,6 @@ #include "hb-style.cc" #include "hb-subset-cff-common.cc" #include "hb-subset-cff1.cc" -#include "hb-subset-cff2-to-cff1.cc" #include "hb-subset-cff2.cc" #include "hb-subset-input.cc" #include "hb-subset-instancer-iup.cc" diff --git a/src/harfbuzz-world.cc b/src/harfbuzz-world.cc index 82d85d586..ca9d0b715 100644 --- a/src/harfbuzz-world.cc +++ b/src/harfbuzz-world.cc @@ -137,7 +137,6 @@ #include "hb-raster-draw.cc" #include "hb-raster-image.cc" #include "hb-raster-paint.cc" -#include "hb-raster.cc" #include "hb-static.cc" #endif @@ -149,7 +148,6 @@ #include "hb-static.cc" #include "hb-subset-cff-common.cc" #include "hb-subset-cff1.cc" -#include "hb-subset-cff2-to-cff1.cc" #include "hb-subset-cff2.cc" #include "hb-subset-input.cc" #include "hb-subset-instancer-iup.cc" diff --git a/src/hb-raster-image.cc b/src/hb-raster-image.cc index baf825279..16b7aa789 100644 --- a/src/hb-raster-image.cc +++ b/src/hb-raster-image.cc @@ -30,6 +30,45 @@ #include +/** + * SECTION:hb-raster + * @title: hb-raster + * @short_description: Glyph rasterization + * @include: hb-raster.h + * + * Functions for rasterizing glyph outlines into pixel buffers. + * + * #hb_raster_draw_t rasterizes outline geometry and always outputs + * @HB_RASTER_FORMAT_A8. Typical flow: + * + * |[ + * hb_raster_draw_t *draw = hb_raster_draw_create_or_fail (); + * hb_raster_draw_set_scale_factor (draw, 64.f, 64.f); + * hb_raster_draw_set_transform (draw, 1.f, 0.f, 0.f, 1.f, 0.f, 0.f); + * hb_raster_draw_set_glyph_extents (draw, &glyph_extents); + * hb_raster_draw_glyph (draw, font, gid, pen_x, pen_y); + * hb_raster_image_t *mask = hb_raster_draw_render (draw); + * ]| + * + * #hb_raster_paint_t renders color paint graphs and always outputs + * @HB_RASTER_FORMAT_BGRA32. Typical flow: + * + * |[ + * hb_raster_paint_t *paint = hb_raster_paint_create_or_fail (); + * hb_raster_paint_set_scale_factor (paint, 64.f, 64.f); + * hb_raster_paint_set_transform (paint, 1.f, 0.f, 0.f, 1.f, 0.f, 0.f); + * hb_raster_paint_set_foreground (paint, foreground); + * hb_glyph_extents_t glyph_extents; + * hb_font_get_glyph_extents (font, gid, &glyph_extents); + * hb_raster_paint_set_glyph_extents (paint, &glyph_extents); + * hb_raster_paint_glyph (paint, font, gid, pen_x, pen_y); + * hb_raster_image_t *img = hb_raster_paint_render (paint); + * ]| + * + * In both modes, set extents explicitly (or via glyph extents) before + * rendering to avoid implicit allocations and to get deterministic bounds. + **/ + #ifdef HAVE_PNG #include #endif diff --git a/src/hb-raster.cc b/src/hb-raster.cc deleted file mode 100644 index 815ce2b71..000000000 --- a/src/hb-raster.cc +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2026 Behdad Esfahbod - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Author(s): Behdad Esfahbod - */ - -#include "hb.hh" - -#include "hb-raster.h" - -/** - * SECTION:hb-raster - * @title: hb-raster - * @short_description: Glyph rasterization - * @include: hb-raster.h - * - * Functions for rasterizing glyph outlines into pixel buffers. - * - * #hb_raster_draw_t rasterizes outline geometry and always outputs - * @HB_RASTER_FORMAT_A8. Typical flow: - * - * |[ - * hb_raster_draw_t *draw = hb_raster_draw_create_or_fail (); - * hb_raster_draw_set_scale_factor (draw, 64.f, 64.f); - * hb_raster_draw_set_transform (draw, 1.f, 0.f, 0.f, 1.f, 0.f, 0.f); - * hb_raster_draw_set_glyph_extents (draw, &glyph_extents); - * hb_raster_draw_glyph (draw, font, gid, pen_x, pen_y); - * hb_raster_image_t *mask = hb_raster_draw_render (draw); - * ]| - * - * #hb_raster_paint_t renders color paint graphs and always outputs - * @HB_RASTER_FORMAT_BGRA32. Typical flow: - * - * |[ - * hb_raster_paint_t *paint = hb_raster_paint_create_or_fail (); - * hb_raster_paint_set_scale_factor (paint, 64.f, 64.f); - * hb_raster_paint_set_transform (paint, 1.f, 0.f, 0.f, 1.f, 0.f, 0.f); - * hb_raster_paint_set_foreground (paint, foreground); - * hb_glyph_extents_t glyph_extents; - * hb_font_get_glyph_extents (font, gid, &glyph_extents); - * hb_raster_paint_set_glyph_extents (paint, &glyph_extents); - * hb_raster_paint_glyph (paint, font, gid, pen_x, pen_y); - * hb_raster_image_t *img = hb_raster_paint_render (paint); - * ]| - * - * In both modes, set extents explicitly (or via glyph extents) before - * rendering to avoid implicit allocations and to get deterministic bounds. - **/ diff --git a/src/hb-subset-cff2-to-cff1.cc b/src/hb-subset-cff2-to-cff1.cc deleted file mode 100644 index 6a65bf5d8..000000000 --- a/src/hb-subset-cff2-to-cff1.cc +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright © 2026 Behdad Esfahbod - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - */ - -/* - * CFF2 to CFF1 Converter - * - * The actual implementation is in hb-subset-cff2.cc where it has access - * to the full cff2_subset_plan definition. - * - * This file just exists to keep the build system happy. - */ - -#include "hb.hh" - -#ifndef HB_NO_SUBSET_CFF - -#include "hb-subset-cff2-to-cff1.hh" - -#endif /* HB_NO_SUBSET_CFF */ diff --git a/src/meson.build b/src/meson.build index 808768da8..7ad675ee0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -396,7 +396,6 @@ hb_subset_sources = files( 'hb-subset-cff-common.hh', 'hb-subset-cff1.cc', 'hb-subset-cff2.cc', - 'hb-subset-cff2-to-cff1.cc', 'hb-subset-cff2-to-cff1.hh', 'hb-subset-input.cc', 'hb-subset-input.hh', @@ -710,7 +709,6 @@ if not get_option('subset').disabled() endif hb_raster_sources = files( - 'hb-raster.cc', 'hb-raster-image.cc', 'hb-raster-image.hh', 'hb-raster.hh', From 32d8dc6fb9eb9c41e79e3fe0b1cb57fc3f0040b6 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 11 Jun 2026 10:14:23 +0200 Subject: [PATCH 007/112] [COLR] Sanitize composite mode before paint callbacks COLR PaintComposite stores its composite mode as an untrusted table byte, while the paint callbacks take hb_paint_composite_mode_t. Avoid casting unsupported table values directly to the public enum. Map unrecognized values to CLEAR, as required by the COLR table comment, before calling push_group_for() and pop_group(). Also drop the duplicated COLR-side composite mode enum values and use the public paint enum names for the accepted values. Testing: meson test -C build Assisted-by: OpenAI Codex --- src/OT/Color/COLR/COLR.hh | 80 +++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index 4b8afb407..dd1dbd15d 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -561,44 +561,6 @@ struct ColorLine // or all of the specified modes. struct CompositeMode : HBUINT8 { - enum { - // Porter-Duff modes - // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators - COMPOSITE_CLEAR = 0, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_clear - COMPOSITE_SRC = 1, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_src - COMPOSITE_DEST = 2, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dst - COMPOSITE_SRC_OVER = 3, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcover - COMPOSITE_DEST_OVER = 4, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstover - COMPOSITE_SRC_IN = 5, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcin - COMPOSITE_DEST_IN = 6, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstin - COMPOSITE_SRC_OUT = 7, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcout - COMPOSITE_DEST_OUT = 8, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstout - COMPOSITE_SRC_ATOP = 9, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_srcatop - COMPOSITE_DEST_ATOP = 10, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_dstatop - COMPOSITE_XOR = 11, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_xor - COMPOSITE_PLUS = 12, // https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_plus - - // Blend modes - // https://www.w3.org/TR/compositing-1/#blending - COMPOSITE_SCREEN = 13, // https://www.w3.org/TR/compositing-1/#blendingscreen - COMPOSITE_OVERLAY = 14, // https://www.w3.org/TR/compositing-1/#blendingoverlay - COMPOSITE_DARKEN = 15, // https://www.w3.org/TR/compositing-1/#blendingdarken - COMPOSITE_LIGHTEN = 16, // https://www.w3.org/TR/compositing-1/#blendinglighten - COMPOSITE_COLOR_DODGE = 17, // https://www.w3.org/TR/compositing-1/#blendingcolordodge - COMPOSITE_COLOR_BURN = 18, // https://www.w3.org/TR/compositing-1/#blendingcolorburn - COMPOSITE_HARD_LIGHT = 19, // https://www.w3.org/TR/compositing-1/#blendinghardlight - COMPOSITE_SOFT_LIGHT = 20, // https://www.w3.org/TR/compositing-1/#blendingsoftlight - COMPOSITE_DIFFERENCE = 21, // https://www.w3.org/TR/compositing-1/#blendingdifference - COMPOSITE_EXCLUSION = 22, // https://www.w3.org/TR/compositing-1/#blendingexclusion - COMPOSITE_MULTIPLY = 23, // https://www.w3.org/TR/compositing-1/#blendingmultiply - - // Modes that, uniquely, do not operate on components - // https://www.w3.org/TR/compositing-1/#blendingnonseparable - COMPOSITE_HSL_HUE = 24, // https://www.w3.org/TR/compositing-1/#blendinghue - COMPOSITE_HSL_SATURATION = 25, // https://www.w3.org/TR/compositing-1/#blendingsaturation - COMPOSITE_HSL_COLOR = 26, // https://www.w3.org/TR/compositing-1/#blendingcolor - COMPOSITE_HSL_LUMINOSITY = 27, // https://www.w3.org/TR/compositing-1/#blendingluminosity - }; public: DEFINE_SIZE_STATIC (1); }; @@ -1532,11 +1494,49 @@ struct PaintComposite void paint_glyph (hb_paint_context_t *c) const { TRACE_PAINT (this); + hb_paint_composite_mode_t composite_mode; + switch ((unsigned int) mode) + { + case HB_PAINT_COMPOSITE_MODE_CLEAR: + case HB_PAINT_COMPOSITE_MODE_SRC: + case HB_PAINT_COMPOSITE_MODE_DEST: + case HB_PAINT_COMPOSITE_MODE_SRC_OVER: + case HB_PAINT_COMPOSITE_MODE_DEST_OVER: + case HB_PAINT_COMPOSITE_MODE_SRC_IN: + case HB_PAINT_COMPOSITE_MODE_DEST_IN: + case HB_PAINT_COMPOSITE_MODE_SRC_OUT: + case HB_PAINT_COMPOSITE_MODE_DEST_OUT: + case HB_PAINT_COMPOSITE_MODE_SRC_ATOP: + case HB_PAINT_COMPOSITE_MODE_DEST_ATOP: + case HB_PAINT_COMPOSITE_MODE_XOR: + case HB_PAINT_COMPOSITE_MODE_PLUS: + case HB_PAINT_COMPOSITE_MODE_SCREEN: + case HB_PAINT_COMPOSITE_MODE_OVERLAY: + case HB_PAINT_COMPOSITE_MODE_DARKEN: + case HB_PAINT_COMPOSITE_MODE_LIGHTEN: + case HB_PAINT_COMPOSITE_MODE_COLOR_DODGE: + case HB_PAINT_COMPOSITE_MODE_COLOR_BURN: + case HB_PAINT_COMPOSITE_MODE_HARD_LIGHT: + case HB_PAINT_COMPOSITE_MODE_SOFT_LIGHT: + case HB_PAINT_COMPOSITE_MODE_DIFFERENCE: + case HB_PAINT_COMPOSITE_MODE_EXCLUSION: + case HB_PAINT_COMPOSITE_MODE_MULTIPLY: + case HB_PAINT_COMPOSITE_MODE_HSL_HUE: + case HB_PAINT_COMPOSITE_MODE_HSL_SATURATION: + case HB_PAINT_COMPOSITE_MODE_HSL_COLOR: + case HB_PAINT_COMPOSITE_MODE_HSL_LUMINOSITY: + composite_mode = (hb_paint_composite_mode_t) (unsigned int) mode; + break; + default: + composite_mode = HB_PAINT_COMPOSITE_MODE_CLEAR; + break; + } + c->funcs->push_group_for (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER); c->recurse (this+backdrop); - c->funcs->push_group_for (c->data, (hb_paint_composite_mode_t) (int) mode); + c->funcs->push_group_for (c->data, composite_mode); c->recurse (this+src); - c->funcs->pop_group (c->data, (hb_paint_composite_mode_t) (int) mode); + c->funcs->pop_group (c->data, composite_mode); c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER); } From fa417b9a77735a28195eb81848dfbc0d4058708f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 11 Jun 2026 10:22:09 +0200 Subject: [PATCH 008/112] [CFF] Check numeric conversion to int Malformed CFF dictionaries can contain real operands outside the representable range of int. Avoid converting those values directly in number_t::to_int(), and make arg_stack_t::pop_int() set the interpreter error when the checked conversion fails. Also make in_int_range() test the stored double value before converting, so serialization-side range checks do not depend on an unchecked conversion. Testing: meson test -C build Assisted-by: OpenAI Codex --- src/hb-cff-interp-common.hh | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/hb-cff-interp-common.hh b/src/hb-cff-interp-common.hh index df90fb99a..c9829a4db 100644 --- a/src/hb-cff-interp-common.hh +++ b/src/hb-cff-interp-common.hh @@ -220,7 +220,22 @@ inline unsigned int OpCode_Size (op_code_t op) { return Is_OpCode_ESC (op) ? 2: struct number_t { void set_int (int v) { value = v; } - int to_int () const { return value; } + bool to_int (int *v) const + { + if (unlikely (!(value >= INT_MIN && value <= INT_MAX))) + { + *v = 0; + return false; + } + *v = (int) value; + return true; + } + int to_int () const + { + int v; + if (likely (to_int (&v))) return v; + return value < 0 ? INT_MIN : value > 0 ? INT_MAX : 0; + } void set_fixed (int32_t v) { value = v / 65536.0; } int32_t to_fixed () const { return value * 65536.0; } @@ -229,7 +244,7 @@ struct number_t double to_real () const { return value; } bool in_int_range () const - { return ((double) (int16_t) to_int () == value); } + { return value >= INT16_MIN && value <= INT16_MAX && (double) (int16_t) value == value; } bool operator > (const number_t &n) const { return value > n.to_real (); } bool operator < (const number_t &n) const { return n > *this; } @@ -446,7 +461,13 @@ struct arg_stack_t : cff_stack_t ARG& pop_num () { return this->pop (); } - int pop_int () { return this->pop ().to_int (); } + int pop_int () + { + int v; + if (unlikely (!this->pop ().to_int (&v))) + S::set_error (); + return v; + } unsigned int pop_uint () { From 85652028179ef4afc86010c28aacdf075dad2dcb Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 11 Jun 2026 10:27:07 +0200 Subject: [PATCH 009/112] [AAT] Size Lookup null object storage correctly The AAT Lookup null object intentionally starts with format 0xFFFF so lookup dispatch treats it as unsupported. However, its specialized null storage was declared as only two bytes, while Null(Lookup) is returned as a Lookup reference. Declare enough storage for the current Lookup object size so binding the null reference is well-defined, while preserving the invalid format bytes. Testing: meson test -C build Assisted-by: OpenAI Codex --- src/hb-aat-layout-common.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh index 5f4bc2352..1a35363c7 100644 --- a/src/hb-aat-layout-common.hh +++ b/src/hb-aat-layout-common.hh @@ -797,7 +797,7 @@ struct Lookup public: DEFINE_SIZE_UNION (2, format.v); }; -DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 2); +DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 13); /* * (Extended) State Table From ba4f5824ba0586e9f0dc56cb74cbec3e7d478b72 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 11 Jun 2026 13:48:12 +0200 Subject: [PATCH 010/112] [meson] Set CMake import libraries for Windows DLLs (#6027) The Meson-generated CMake package described Windows shared-library targets with IMPORTED_LOCATION pointing at the import library. CMake expects DLL imported targets to put the runtime DLL in IMPORTED_LOCATION and the import library in IMPORTED_IMPLIB. Generate bindir-aware paths for Windows CMake packages and set both target properties for all HarfBuzz imported targets. Static and non-Windows shared builds keep their existing single-location behavior. Fixes: https://github.com/harfbuzz/harfbuzz/issues/6026 Testing: meson setup build --reconfigure meson compile -C build meson test -C build MinGW cross configure/build/install in /private/tmp CMake consumer configure/build against harfbuzz::harfbuzz and harfbuzz::subset Assisted-by: OpenAI Codex --- src/harfbuzz-config.cmake.in | 25 +++++++++++++++++-------- src/meson.build | 29 +++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/harfbuzz-config.cmake.in b/src/harfbuzz-config.cmake.in index 2d990efab..fc4774b45 100644 --- a/src/harfbuzz-config.cmake.in +++ b/src/harfbuzz-config.cmake.in @@ -4,31 +4,40 @@ set_and_check(HARFBUZZ_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") set(HARFBUZZ_VERSION "@HARFBUZZ_VERSION@") +function(_harfbuzz_set_imported_library target library_name) + set_target_properties("${target}" PROPERTIES + IMPORTED_LOCATION "@HB_LIB_DIR@/@HB_LIB_PREFIX@${library_name}@HB_LIB_SUFFIX@") + if (@HB_HAS_IMPORT_LIBRARY@) + set_target_properties("${target}" PROPERTIES + IMPORTED_IMPLIB "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@HB_IMPLIB_PREFIX@${library_name}@HB_IMPLIB_SUFFIX@") + endif () +endfunction() + # Add the libraries. add_library(harfbuzz::harfbuzz @HB_LIBRARY_TYPE@ IMPORTED) set_target_properties(harfbuzz::harfbuzz PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@" - IMPORTED_LOCATION "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@HB_LIB_PREFIX@harfbuzz@HB_LIB_SUFFIX@") + INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@") +_harfbuzz_set_imported_library(harfbuzz::harfbuzz harfbuzz) add_library(harfbuzz::icu @HB_LIBRARY_TYPE@ IMPORTED) set_target_properties(harfbuzz::icu PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@" - INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz" - IMPORTED_LOCATION "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@HB_LIB_PREFIX@harfbuzz-icu@HB_LIB_SUFFIX@") + INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz") +_harfbuzz_set_imported_library(harfbuzz::icu harfbuzz-icu) add_library(harfbuzz::subset @HB_LIBRARY_TYPE@ IMPORTED) set_target_properties(harfbuzz::subset PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@" - INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz" - IMPORTED_LOCATION "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@HB_LIB_PREFIX@harfbuzz-subset@HB_LIB_SUFFIX@") + INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz") +_harfbuzz_set_imported_library(harfbuzz::subset harfbuzz-subset) # Only add the gobject library if it was built. if (@HB_HAVE_GOBJECT@) add_library(harfbuzz::gobject @HB_LIBRARY_TYPE@ IMPORTED) set_target_properties(harfbuzz::gobject PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@" - INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz" - IMPORTED_LOCATION "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@HB_LIB_PREFIX@harfbuzz-gobject@HB_LIB_SUFFIX@") + INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz") + _harfbuzz_set_imported_library(harfbuzz::gobject harfbuzz-gobject) endif () check_required_components(harfbuzz) diff --git a/src/meson.build b/src/meson.build index 7ad675ee0..819cf8c2a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1109,6 +1109,16 @@ if fs.is_absolute(cmake_install_libdir) endif endif +cmake_install_bindir = get_option('bindir') + +if fs.is_absolute(cmake_install_bindir) + if meson.version().version_compare('>=1.3.0') + cmake_install_bindir = fs.relative_to(cmake_install_bindir, get_option('prefix')) + else + cmake_install_bindir = run_command(relative_to, cmake_install_bindir, get_option('prefix'), check: true).stdout().strip() + endif +endif + cmake_config.set('PACKAGE_INIT', ''' get_filename_component(PACKAGE_PREFIX_DIR "@0@" ABSOLUTE) @@ -1132,21 +1142,36 @@ endmacro() cmake_config.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_includedir)) cmake_config.set('PACKAGE_CMAKE_INSTALL_LIBDIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_libdir)) +cmake_config.set('PACKAGE_CMAKE_INSTALL_BINDIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_bindir)) cmake_config.set('PACKAGE_INCLUDE_INSTALL_DIR', '${PACKAGE_PREFIX_DIR}/@0@/@1@'.format(cmake_install_includedir, meson.project_name())) cmake_config.set('HARFBUZZ_VERSION', meson.project_version()) cmake_config.set('HB_HAVE_GOBJECT', have_gobject ? 'YES' : 'NO') cmake_config.set('HB_LIBRARY_TYPE', get_option('default_library') == 'static' ? 'STATIC' : 'SHARED') +cmake_config.set('HB_HAS_IMPORT_LIBRARY', 'NO') +cmake_config.set('HB_IMPLIB_PREFIX', '') +cmake_config.set('HB_IMPLIB_SUFFIX', '') if get_option('default_library') == 'static' + cmake_config.set('HB_LIB_DIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_libdir)) cmake_config.set('HB_LIB_PREFIX', '${CMAKE_STATIC_LIBRARY_PREFIX}') cmake_config.set('HB_LIB_SUFFIX', '${CMAKE_STATIC_LIBRARY_SUFFIX}') elif host_machine.system() == 'darwin' + cmake_config.set('HB_LIB_DIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_libdir)) cmake_config.set('HB_LIB_PREFIX', '${CMAKE_SHARED_LIBRARY_PREFIX}') cmake_config.set('HB_LIB_SUFFIX', '.@0@${CMAKE_SHARED_LIBRARY_SUFFIX}'.format(hb_so_version)) elif host_machine.system() == 'windows' - cmake_config.set('HB_LIB_PREFIX', '${CMAKE_IMPORT_LIBRARY_PREFIX}') - cmake_config.set('HB_LIB_SUFFIX', '${CMAKE_IMPORT_LIBRARY_SUFFIX}') + cmake_config.set('HB_HAS_IMPORT_LIBRARY', 'YES') + cmake_config.set('HB_LIB_DIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_bindir)) + cmake_config.set('HB_LIB_PREFIX', '${CMAKE_SHARED_LIBRARY_PREFIX}') + if hb_so_version == '' + cmake_config.set('HB_LIB_SUFFIX', '${CMAKE_SHARED_LIBRARY_SUFFIX}') + else + cmake_config.set('HB_LIB_SUFFIX', '-@0@${CMAKE_SHARED_LIBRARY_SUFFIX}'.format(hb_so_version)) + endif + cmake_config.set('HB_IMPLIB_PREFIX', '${CMAKE_IMPORT_LIBRARY_PREFIX}') + cmake_config.set('HB_IMPLIB_SUFFIX', '${CMAKE_IMPORT_LIBRARY_SUFFIX}') else + cmake_config.set('HB_LIB_DIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_libdir)) cmake_config.set('HB_LIB_PREFIX', '${CMAKE_SHARED_LIBRARY_PREFIX}') cmake_config.set('HB_LIB_SUFFIX', '${CMAKE_SHARED_LIBRARY_SUFFIX}.@0@'.format(version)) endif From a95d2a18ab0084b3fed5e5c6737f60d2c985bbeb Mon Sep 17 00:00:00 2001 From: Vyacheslav Yurkov Date: Fri, 12 Jun 2026 22:18:13 +0200 Subject: [PATCH 011/112] [cmake]: Weak assignment of the C++ standard (#6029) Some projects may need higher C++ standard than C++11. In order not to force the requirement for the whole project, the C++ standard can be set at the configure time with -DCMAKE_CXX_STANDARD=20 for example. The project default takes precedence only when there's no assignment provided in the command line by setting the default cache value. There's no need to additionally check for the compiler support when CMAKE_CXX_STANDARD_REQUIRED is already set. Signed-off-by: Vyacheslav Yurkov --- CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5ab53946..6b5d4d7e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,9 @@ if(POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() -set(CMAKE_CXX_STANDARD 11) +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif() set(CMAKE_CXX_STANDARD_REQUIRED ON) ## Disallow in-source builds, as CMake generated make files can collide with autotools ones @@ -350,7 +352,8 @@ if (HB_HAVE_ICU) find_package(ICU REQUIRED COMPONENTS uc) - if (ICU_VERSION VERSION_GREATER_EQUAL 75.1) + if (ICU_VERSION VERSION_GREATER_EQUAL 75.1 AND + CMAKE_CXX_STANDARD LESS 17) set(CMAKE_CXX_STANDARD 17) endif () @@ -758,13 +761,6 @@ if (UNIX OR MINGW OR VITA) # No threadsafe statics as we do it ourselves set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics") endif () - - CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) - if (COMPILER_SUPPORTS_CXX11) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - else() - message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") - endif() endif () From 9c7f4dffe5215fc30d67c85e94289970f41d4dd3 Mon Sep 17 00:00:00 2001 From: Qunxin Liu <48925186+qxliu76@users.noreply.github.com> Date: Tue, 16 Jun 2026 00:48:35 -0700 Subject: [PATCH 012/112] [subset-repack] add additional sorting after extension promotion (#6033) assign_spaces() requires correct topological ordering to find space roots, so add an additional topo sorting after extension promotion and table splitting to keep thing sorted --- src/hb-repacker.hh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/hb-repacker.hh b/src/hb-repacker.hh index b5dfae199..dbf65c309 100644 --- a/src/hb-repacker.hh +++ b/src/hb-repacker.hh @@ -379,6 +379,17 @@ hb_resolve_graph_overflows (hb_tag_t table_tag, DEBUG_MSG (SUBSET_REPACK, nullptr, "Extensions promotion failed."); return false; } + + // an additional sorting is needed before assign_spaces () which requires + // correct topological ordering to find space roots + sorted_graph.sort_shortest_distance_if_needed (); + if (sorted_graph.in_error ()) + { + DEBUG_MSG (SUBSET_REPACK, nullptr, "Sorted graph in error state."); + return false; + } + + if (!graph::will_overflow (sorted_graph)) return true; } DEBUG_MSG (SUBSET_REPACK, nullptr, "Assigning spaces to 32 bit subgraphs."); From 72dfc30899653306a1100752a786f3d42bfd2a9f Mon Sep 17 00:00:00 2001 From: j0j1j2 <000111000e@gmail.com> Date: Tue, 16 Jun 2026 20:55:17 +0900 Subject: [PATCH 013/112] [hangul] Apply 'calt' feature to non-Hangul characters in Hangul runs (#6030) --- src/hb-ot-shaper-hangul.cc | 24 +++++++++++++++--- ...0387433d01cd5799e421dad6510a54c862f56b.ttf | Bin 0 -> 956 bytes test/shape/data/in-house/meson.build | 1 + .../data/in-house/tests/hangul-calt.tests | 5 ++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 test/shape/data/in-house/fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf create mode 100644 test/shape/data/in-house/tests/hangul-calt.tests diff --git a/src/hb-ot-shaper-hangul.cc b/src/hb-ot-shaper-hangul.cc index ce87a9156..514b078bf 100644 --- a/src/hb-ot-shaper-hangul.cc +++ b/src/hb-ot-shaper-hangul.cc @@ -67,14 +67,23 @@ static void override_features_hangul (hb_ot_shape_planner_t *plan) { /* Uniscribe does not apply 'calt' for Hangul, and certain fonts - * (Noto Sans CJK, Source Sans Han, etc) apply all of jamo lookups - * in calt, which is not desirable. */ - plan->map.disable_feature (HB_TAG('c','a','l','t')); + * (Noto Sans CJK, Source Han Sans, etc) apply all of jamo lookups + * in calt, which is not desirable. + * + * Rather than disabling 'calt' for the entire run, which also turns + * it off for any other characters in the run, allocate a mask for it + * and clear that mask on jamo only (in setup_masks_hangul). That + * keeps jamo out of reach of such lookups while letting the rest of + * the run shape with 'calt' as usual. + * + * https://github.com/harfbuzz/harfbuzz/discussions/4853 */ + plan->map.add_feature (HB_TAG('c','a','l','t')); } struct hangul_shape_plan_t { hb_mask_t mask_array[HANGUL_FEATURE_COUNT]; + hb_mask_t calt_mask; }; static void * @@ -87,6 +96,8 @@ data_create_hangul (const hb_ot_shape_plan_t *plan) for (unsigned int i = 0; i < HANGUL_FEATURE_COUNT; i++) hangul_plan->mask_array[i] = plan->map.get_1_mask (hangul_features[i]); + hangul_plan->calt_mask = plan->map.get_1_mask (HB_TAG('c','a','l','t')); + return hangul_plan; } @@ -405,7 +416,14 @@ setup_masks_hangul (const hb_ot_shape_plan_t *plan, unsigned int count = buffer->len; hb_glyph_info_t *info = buffer->info; for (unsigned int i = 0; i < count; i++, info++) + { info->mask |= hangul_plan->mask_array[info->hangul_shaping_feature()]; + + /* Keep 'calt' away from jamo; see override_features_hangul(). */ + hb_codepoint_t u = info->codepoint; + if (isL (u) || isV (u) || isT (u)) + info->mask &= ~hangul_plan->calt_mask; + } } HB_BUFFER_DEALLOCATE_VAR (buffer, hangul_shaping_feature); diff --git a/test/shape/data/in-house/fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf b/test/shape/data/in-house/fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf new file mode 100644 index 0000000000000000000000000000000000000000..41825c74395738740e05a8dd41b16588c42f3c71 GIT binary patch literal 956 zcmah|ziU%b6#mY=FG&+?wGyRNg(!7V(JB~38l|n;4uwJ*rGpwT@%hs5@)Da@sGFOE zi#T=YEDjD8916PV(%FAP97Go#C4ToNO(P9>;NEk-@BDb@p2LFxIDlu+n4DX>GjsC$ zSOL&EvYU%b7cWm=(Ro0w5^h|_7~#!#P@>m>0@e&I?qe0zIk-+!@C;ok39J* z34K~#(f-9VQLV@8YMB;fgV%W2s2Gcwf0);J-K;lp5Q_dW;#_3v{+}0{&*`5eUTZd5 z@tL^?pNQXB4BI=;%JHdE`OwsFX#I^0z81G{^=oTWw5{xfIXc(on>yW)vz7Wq95dXb zb~Aefv|5&zNWj~p23vfZ^q0RuVPs*;&S0?Qpn9DRj}x*68I z2Dy2Ap~U&RjdQBDBZ0DIFyg|q-FVB>!#&KnXknJ%EGIIIW2_})?Vgmg($ooOWn7N9 VoqEi+U+Ux@>1vPvYA28N{{lh6b94Xz literal 0 HcmV?d00001 diff --git a/test/shape/data/in-house/meson.build b/test/shape/data/in-house/meson.build index 12a313a83..1253b08e5 100644 --- a/test/shape/data/in-house/meson.build +++ b/test/shape/data/in-house/meson.build @@ -22,6 +22,7 @@ in_house_tests = [ 'emoji-clusters.tests', 'fallback-positioning.tests', 'glyph-props-no-gdef.tests', + 'hangul-calt.tests', 'hangul-jamo.tests', 'harfbust.tests', 'hebrew-diacritics.tests', diff --git a/test/shape/data/in-house/tests/hangul-calt.tests b/test/shape/data/in-house/tests/hangul-calt.tests new file mode 100644 index 000000000..0c1eba6c4 --- /dev/null +++ b/test/shape/data/in-house/tests/hangul-calt.tests @@ -0,0 +1,5 @@ +../fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf;;U+AC00,U+003D,U+003E;[ga=0+600|eq_gt.calt=1+600] +../fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf;;U+AC00,U+B098;[ga_na.calt=0+600] +../fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf;;U+1100,U+1100;[jamoL=0+600|jamoL=1+600] +../fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf;;U+B098,U+B098;[na_na.liga=0+600] +../fonts/600387433d01cd5799e421dad6510a54c862f56b.ttf;--features=calt=0;U+AC00,U+003D,U+003E;[ga=0+600|equal=1+600|greater=2+600] From ce1228bf5a337ebce438ab6658f13289688dd229 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 17 Jun 2026 10:04:23 +0200 Subject: [PATCH 014/112] [blob] Fix a pathological int overflow issue (#6034) --- src/hb-blob.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-blob.cc b/src/hb-blob.cc index 3c00808e4..f5d4efd6c 100644 --- a/src/hb-blob.cc +++ b/src/hb-blob.cc @@ -662,7 +662,7 @@ _hb_blob_try_mmap (const char *file_name) if (unlikely (!file)) return nullptr; auto file_guard = hb_make_scope_guard ([&]() { hb_free (file); }); - unsigned int size = strlen (file_name) + 1; + size_t size = strlen (file_name) + 1; wchar_t *wchar_file_name = (wchar_t *) hb_malloc (sizeof (wchar_t) * size); if (unlikely (!wchar_file_name)) return nullptr; From f2dd8dcb815993b9e81d2cdfd61b8b73b28c7f9a Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Mon, 15 Jun 2026 16:10:47 -0700 Subject: [PATCH 015/112] [subset] do math closure before gsub closure --- src/hb-subset-plan.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index b1325dd2e..0d75dc8ab 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -452,20 +452,20 @@ _populate_gids_to_retain (hb_subset_plan_t* plan, _cmap_closure (plan->source, &plan->unicodes, &plan->_glyphset_gsub); + if (!drop_tables->has (HB_OT_TAG_MATH)) + { + _math_closure (plan, &plan->_glyphset_gsub); + _remove_invalid_gids (&plan->_glyphset_gsub, plan->source->get_num_glyphs ()); + } + plan->_glyphset_mathed = plan->_glyphset_gsub; + #ifndef HB_NO_SUBSET_LAYOUT layout_populate_gids_to_retain(plan, drop_tables); #endif _remove_invalid_gids (&plan->_glyphset_gsub, plan->source->get_num_glyphs ()); - plan->_glyphset_mathed = plan->_glyphset_gsub; - if (!drop_tables->has (HB_OT_TAG_MATH)) - { - _math_closure (plan, &plan->_glyphset_mathed); - _remove_invalid_gids (&plan->_glyphset_mathed, plan->source->get_num_glyphs ()); - } - - hb_set_t cur_glyphset = plan->_glyphset_mathed; + hb_set_t cur_glyphset = plan->_glyphset_gsub; if (!drop_tables->has (HB_OT_TAG_COLR)) { _colr_closure (plan, &cur_glyphset); From ac0979b6f44b41894c73fd208a0b4f5a8c6dc6ff Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Mon, 15 Jun 2026 12:48:51 -0700 Subject: [PATCH 016/112] [subset] fix bug in math table Don't keep constructions for glyphs that are only added during math closure, since we don't do recursive closure over math table. --- src/hb-ot-math-table.hh | 2 +- src/hb-subset-plan-member-list.hh | 1 + src/hb-subset-plan.cc | 1 + .../math/STIXTwoMath-Regular.default.21D4.ttf | Bin 0 -> 6240 bytes .../STIXTwoMath-Regular.default.2f,7c,305.ttf | Bin 6388 -> 6388 bytes .../math/STIXTwoMath-Regular.default.all.ttf | Bin 1033524 -> 1033012 bytes .../STIXTwoMath-Regular.glyph-names.21D4.ttf | Bin 0 -> 6288 bytes ...XTwoMath-Regular.glyph-names.2f,7c,305.ttf | Bin 6540 -> 6540 bytes .../STIXTwoMath-Regular.glyph-names.all.ttf | Bin 1086300 -> 1085788 bytes ...TIXTwoMath-Regular.notdef-outline.21D4.ttf | Bin 0 -> 6488 bytes ...oMath-Regular.notdef-outline.2f,7c,305.ttf | Bin 6636 -> 6636 bytes ...STIXTwoMath-Regular.notdef-outline.all.ttf | Bin 1033772 -> 1033260 bytes .../STIXTwoMath-Regular.retain-gids.21D4.ttf | Bin 0 -> 15724 bytes ...XTwoMath-Regular.retain-gids.2f,7c,305.ttf | Bin 14916 -> 14928 bytes .../STIXTwoMath-Regular.retain-gids.all.ttf | Bin 1048712 -> 1048476 bytes test/subset/data/tests/math.tests | 1 + 16 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 test/subset/data/expected/math/STIXTwoMath-Regular.default.21D4.ttf create mode 100644 test/subset/data/expected/math/STIXTwoMath-Regular.glyph-names.21D4.ttf create mode 100644 test/subset/data/expected/math/STIXTwoMath-Regular.notdef-outline.21D4.ttf create mode 100644 test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.21D4.ttf diff --git a/src/hb-ot-math-table.hh b/src/hb-ot-math-table.hh index f79808fa9..fe6c335ad 100644 --- a/src/hb-ot-math-table.hh +++ b/src/hb-ot-math-table.hh @@ -931,7 +931,7 @@ struct MathVariants bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - const hb_set_t &glyphset = c->plan->_glyphset_mathed; + const hb_set_t &glyphset = c->plan->_glyphset_cmaped; const hb_map_t &glyph_map = *c->plan->glyph_map; auto *out = c->serializer->start_embed (*this); diff --git a/src/hb-subset-plan-member-list.hh b/src/hb-subset-plan-member-list.hh index 398fe81ec..d91edba9d 100644 --- a/src/hb-subset-plan-member-list.hh +++ b/src/hb-subset-plan-member-list.hh @@ -65,6 +65,7 @@ HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset) HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_gsub) HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_mathed) HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_colred) +HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_cmaped) //active lookups we'd like to retain HB_SUBSET_PLAN_MEMBER (hb_map_t, gsub_lookups) diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 0d75dc8ab..02f891a14 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -451,6 +451,7 @@ _populate_gids_to_retain (hb_subset_plan_t* plan, plan->_glyphset_gsub.add (0); // Not-def _cmap_closure (plan->source, &plan->unicodes, &plan->_glyphset_gsub); + plan->_glyphset_cmaped = plan->_glyphset_gsub; if (!drop_tables->has (HB_OT_TAG_MATH)) { diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.default.21D4.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.default.21D4.ttf new file mode 100644 index 0000000000000000000000000000000000000000..a9f37ff42f653633a7b017d466903d7af7667650 GIT binary patch literal 6240 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 ORZ5T&pN@I7?)HB=NVQA= delta 1119 zcmWmDaZFWJ90%~ocP~VV{ zj3GW48j+fVYs-~?y`|RX?2pF^T|>(LvH~k`T5qitk*jp9WoPU(*axZL?c_Ae;BgmPr!S3~Fi8h7BVi=qd&U`f z&X|RB#vHt5%)>v0mzeMgAIul|aGh8WOGF7Q6J_uT@hq$nHLzCH!a7k0>qR|m5DhRS zLU3zbY(?27w!s(0U3gF2gNtGjE{P@huUSFNtTZcOwOI{oOtdzG<^kAe_Q4_Z7(8j7 zgs08Z@QjHCm>0|oaMT=ymmFUcb6j^^hu=$Vjr7R42PIGD!F-9;$O2ga3uPgER6Y*N zBvv5ndSP6p-|biZa6k>fBkBkoRD*Cx z4Z)-8C_Ju?!xQQR9Cp4+%-Q2a2WOwlLmQYY$CX3Om1|+vRD&S;greAek~`7HdwOJMBroG|GvV z%k2q&PI_ct_ODG&`k&@`3+ywT)qET|2kMtddVDZlSI^sz1Pa(}vLVpoj^~n2_!DTE zc_@eVvP1M3>u3E`s?BKMQJMC$_8V=~{?h)VO?p6YrRVjR^|xuieonti@8~Igna25U z-bp|4i~JJ(!9U@XbcbK#-!jH$`0vc%clceF%NO|~Tj#vu@~{Weo56b0o52n~WQDCT zAGe~`E`Hf+wc7ZnnP)Ro{7U98ZsPyAyWQPJ_Nu*E_ZzDR5~0CFh#?xHBOEahftZK` Uk%&T^hzrR;R(zZYStGmu2cp9St^fc4 diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.glyph-names.21D4.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.glyph-names.21D4.ttf new file mode 100644 index 0000000000000000000000000000000000000000..8e3a8cc075b8ec168289affd5bca5e56e67b4d77 GIT binary patch literal 6288 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 diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.notdef-outline.21D4.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.notdef-outline.21D4.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3a21674132404d30770856e220641a53037091a2 GIT binary patch literal 6488 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 delta 42 wcmaE3{Ki;>fsuiMK?q2&FetdYxVkY2FtBVCF=k|Bp6tQ+m~s1N9i{`~0IG)w;Q#;t diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.notdef-outline.all.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.notdef-outline.all.ttf index c589e1d467e193d6fff0fddc6a9b7edefdfeebdc..285d711c1313af0e203ca8075653735fa5562aa2 100644 GIT binary patch delta 646 zcmW;ITS$~a6bJDCIp1u$?Wf;`OS1wWY?Fe7 zB+`$l=ZJbSP?l)bpeP@rAc8a#mJnnyyJ4u=Vq&w+@H-D@hBI@{P=E1IU$GAaAWjB> z%&H?5l|`=VEP(FGY;IM3o%2@Li5(#4b>QTcD(CUCp};5url9n@ru3L2s9tU`V7jTf5cnODig;#KxS9ul1 z9Of`ec#YRk%Imz2GNn>!MY(c8xr=7yk@5!pN>JIruurs!E=-D1F^13LnRtg;@m_qu zl9&?Tuqu9v6^a#M5vC-|E7eBHk-?BRG8j6ixiz;K)|#|tF`~69p^tRWrZ zyWXvLo1){}6SkVnFe3w0Q(?8LB}kN;UO?uuac$gnW86g&ONt~Ule9^SlAkaDGPJxL9XMX6MQ2OB)4ha^goqj;3oa$c{1^g{89 zl~8&RY$&$1p<834eY#ld1E~+!C?yR=>r+*z3QeoT7)5OS(-2K9NEE-f$@lZiWOsi% zGnpMZRxxs-B0-FZRs&AHs>*GFtvoP8WQ-7LB~`WCgKx$|4-?z*I#J`1s^E^NMn*4d zMCK28=I`hH_0KF%y!#Q+x;dii((S?Gl2~c5h=|=l*XBqpeBiY9Rwq$3kEmug^6Ej~ zrhMxxdT+-4(R~M6WbCD4JwcRlYxtOV^@p5RJipwV&

$0@WBF605^zDutb!=GEoMf5YNIIQ3Gp5EvyrDuwK-|2GIaR zA_R9P#7>l5Vi$Z-+=KVUeYhl+;IdeT|C$xV%u2HoR-4tZ#zbo~XdZ%nW*;0fPrx(g z8FWfO*lp2rrqJ;F#kpVvd`RoA5iCMNE2R!h@18^I?I+YGk1-ghjFlJ}MuF zWfCipb@Do#l2dS6PQ%;sHvC?_Kuk5NM%bj9;BK`W?ooSSScPFkMPO7#VT)>kZK@5n zt9G0y6;mV$C>hh3@*9#UAP>Q>#bNA&6CIp=E)Q*Cu3T3xF;||2SzFB(=4FgvTu!UkF& zxJ_biryHMlFJ^B}{{X33LuRw))cjhxhJBq{DE>TCFE_rl$Dh1qpZ2e{r~FQP(l3p2 zqLp%c!k?QS*;oDRQj`9tdHy2%6lb*nN6vxz1(F^gPS>0T`;kB)n@cqWTHJ{|(g}Y8 ztuPPevR-zC9%KEipGvhE?OQ6-e$sxWt=eDOf3!^x=&kg;{)+xK9n>%A*XbR7R$rlU z{xXl#kNh$pqu==zK1p}^4gL*de1`wV41Sm2V|jduFR=~IYc3CaFufV9C%qZ$@IzME z3iEL*YVG4!tyZgzf0Frr<}AOK`Lmn&KkjaKx3MN`fA#}L&OkCWm<%yQLv(~A1|kp> WaUc>=h!b%k8OW-SlOgMk_WuD3Vgp|Q diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.21D4.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.21D4.ttf new file mode 100644 index 0000000000000000000000000000000000000000..df494264da759b965142e246fff18a8b44862deb GIT binary patch literal 15724 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.2f,7c,305.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.2f,7c,305.ttf index 77a863619d98b4198136807965cb2391159a55fc..1769e121eff087c3623cc8d289b67b507c71e5b5 100644 GIT binary patch delta 230 zcmX?7a-l?qfsuiMK?q2&FetdYxVnish?y}kFzx_~noN|D4pad$tb83qJa+e2Z~;|K z0ZLBu57sxzNh>j8U|?DTlut;`O)Oxa$$kjPPXO{=lFLdIv}O5cFfcH)0Qo!83et0v z^qK1!7)0Mp?2s3f0BOufO-zx0`vGVO)Sld`~H6VBp#_@r692 z&SVZodB#1HH5lg`vH^_(DrS1c^ooIzMTJELNUE`@F)*^GvSt9uiL6tBz5)4%Np8o| NW2~v0-!Mj4003?wHGBX7 delta 218 zcmcama->9tfsuiMK?q2&FetdYxVmw>a$7MlFzx_~YD|=o4wL{gtb83qJa+e2Z~;|y z041mS2kRT%9+OqsWIi?>#{*JVQ^xPzU z=6VJO(FYSdk!Kp%koz$CY0_a5n=n}0AySO5Sx Ci8Orx diff --git a/test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.all.ttf b/test/subset/data/expected/math/STIXTwoMath-Regular.retain-gids.all.ttf index c77123e91f167402f32a9bc6e5d470809d292662..d39aebc4ccc704e3ea8aa23510f12faf8458110b 100644 GIT binary patch delta 1077 zcmWmCe@vBC7{Kx8Iqx}#d*5@<`^LSO`w}9v7~-6LpK z&>(0{xBBPq^$%+O5sIaQfOe%U*+T6HZBj<$NPdXq7!hl%77;_~@sIE4IcIy{ot^C* zZ^{2)HLna10Q>}pb>X7ot>NU-1_03oV0;wb{#1Ea_R$o8{tkfWTEpc#3nst+!w=xy zLEkJsv1LbzIB%{2Si2jbv?EfMz$#ZFl}XGliyTj4zgI=hr1?V|0QP@aRkQb{OJAHc z0h~x-|FT-vkhQXoJS>~YH|5*pG5L;LCzBsMMe8&2EZHr4$aAuf z{8C;Z2joTaTlpP%MGld}@@IEYw!1Ac@y)jZV^(8U0X^tRCR05xkS}`1$O-dLKy$%d zApcS}pbDxuGC{2&*Qxu+^(vLzq#ht2QV)}vDvR8#^2j1pOg^qk$?fWC@>#Wu+@t6e z^|IQVNTX8GMOC$;E2=tGPd56>0ew5&B<}@14(PuT2ml5`0mq&3uIItqag9;aEDYig z(I=C;|JUm zrKxx>+F$x=Y;y@1kVtQ56=NU)y?8GqV-q$(I<{gfJiM+c%;)=4h!UR%ws+;6ZKbAXe*;4&m!MUdLmjPSA;X zL?`KdY|_mIx&YgCk=}iVpBTlE& sDY~6coPN>sR$IlfwhE*eWl)?Fl%!%P59OsyN>M&aQ`YBg74|~=|6Tqw}k?+1woBeBT6WOMFK^v z=mJJtf(ABY{6YKyC=mnl;npBnpcREEG}cW)Oev8{ng#@liG+~K`f4WcbMKj%Kj)s@ zPqI(8ZJIHcn24f4(Ab))MD>}xGo3`ne!Td&rtYZ)`ybm-OmuuZ(Q}(?7A&m1{Nwc~ zkyC|#?#!F{^sN5NH!PyUSwwSorsl@A3}gnY+N<2!a-vY4jDu6nk*rf6XXQ=h@1!~ z$tkcbER)5>jo7V_D`1msf~)0PxK6$aH_1(~Rkns3Wl`yF?DxvO@PIr3+hsdECXc~R z*$Gd})9{=;2QxAg_R3w!EyU(lb1VGN{19$4x51Qo5FR!U!?bxEo-|LwF7sD-$-D%w zm{;JSiB8Px=07lNW{EAfa$($x!y>B)j<+6$rB*4duqt4sRSD-9v1&)R2UkKGF|*tg(qXF0Lck$NDSEZF7#(`mD$J?2WVW0rTOQs|#Q!V9kwn4&YfiODkE)(3`1`P~ z_5tn)SJsZ_L+Oudm*pm>lTHP=Nm({2&Nh#xB7TRHG=(?wW-8MzYW*}-8`N&lH0_Sg zl+b7EE2v&?)_2faeZT%Q?a;3XK_|p&(Lw{FQ*_av;*>Z=H^mR)0^Jf9MIW>17nj)( zzl#Aj#Z~b)JL0a$azWD24V}li2izVmb~A2OZkxZwU^ zY diff --git a/test/subset/data/tests/math.tests b/test/subset/data/tests/math.tests index 91a2405d1..3582e265a 100644 --- a/test/subset/data/tests/math.tests +++ b/test/subset/data/tests/math.tests @@ -9,4 +9,5 @@ notdef-outline.txt SUBSETS: U+2f,U+7c,U+305 +U+21D4 * From 9e6929319b2bb3d7f6a5fadf13ced727ab423c3a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 20 Jun 2026 20:18:56 +0200 Subject: [PATCH 017/112] [rust] Use harfrust table-backed font API (#6036) * [rust] Use harfrust table-backed font API * [rust] Roll HR forward --- src/rust/Cargo.toml | 2 +- src/rust/shape.rs | 156 ++++++++++++++++++++++++++++---------------- 2 files changed, 99 insertions(+), 59 deletions(-) diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 736265fa7..c91548da3 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" rust-version = "1.87.0" [dependencies] -harfrust = { version = "0.8.3", optional = true } +harfrust = { version = "0.10.0", features = ["experimental_font_api"], optional = true } # harfrust = { git = "https://github.com/harfbuzz/harfrust", optional = true } read-fonts = "0.39.*" skrifa = { version = "0.*", optional = true } diff --git a/src/rust/shape.rs b/src/rust/shape.rs index 26c47e373..384592388 100644 --- a/src/rust/shape.rs +++ b/src/rust/shape.rs @@ -5,16 +5,18 @@ use super::hb::*; use std::ffi::c_void; -use std::mem::{align_of, offset_of, size_of, transmute}; +use std::mem::{align_of, offset_of, size_of}; use std::ptr::null_mut; +use std::sync::Arc; use harfrust::{ - funcs::{AdvanceWidthBatch, BuiltinFontFuncs, FontFuncs}, - FontRef, GlyphExtents, GlyphFlags as HRGlyphFlags, GlyphInfo as HRGlyphInfo, - GlyphPosition as HRGlyphPosition, NormalizedCoord, ShapeOptions, Shaper, ShaperData, - ShaperInstance, Tag, + font::{ + AdvanceWidthBatch, BuiltinFontFuncs, Font, FontBlob, FontFuncs, FontInstance, + FontTableFunction, + }, + GlyphExtents, GlyphFlags as HRGlyphFlags, GlyphId, GlyphInfo as HRGlyphInfo, + GlyphPosition as HRGlyphPosition, NormalizedCoord, ShapeOptions, Tag, }; -use read_fonts::types::GlyphId; use smallvec::SmallVec; type HRFeatureVec = SmallVec<[harfrust::Feature; 4]>; @@ -51,36 +53,84 @@ const _: () = { assert!(offset_of!(hb_glyph_position_t, y_offset) == offset_of!(HRGlyphPosition, y_offset)); }; -pub struct HBHarfRustFaceData<'a> { - face_blob: *mut hb_blob_t, - font_ref: FontRef<'a>, - shaper_data: ShaperData, +pub struct HBHarfRustFaceData { + font: Font, } +struct HbFace(*mut hb_face_t); + +impl HbFace { + unsafe fn new(face: *mut hb_face_t) -> Self { + Self(hb_face_reference(face)) + } + + fn reference_table(&self, tag: Tag) -> *mut hb_blob_t { + unsafe { hb_face_reference_table(self.0, u32::from_be_bytes(tag.to_be_bytes())) } + } +} + +impl Drop for HbFace { + fn drop(&mut self) { + unsafe { + hb_face_destroy(self.0); + } + } +} + +unsafe impl Send for HbFace {} +unsafe impl Sync for HbFace {} + +struct HbBlob(*mut hb_blob_t); + +impl Drop for HbBlob { + fn drop(&mut self) { + unsafe { + hb_blob_destroy(self.0); + } + } +} + +impl AsRef<[u8]> for HbBlob { + fn as_ref(&self) -> &[u8] { + let mut length = 0; + let data = unsafe { hb_blob_get_data(self.0, &mut length) }; + if data.is_null() { + &[] + } else { + unsafe { std::slice::from_raw_parts(data.cast(), length as usize) } + } + } +} + +unsafe impl Send for HbBlob {} +unsafe impl Sync for HbBlob {} + #[unsafe(no_mangle)] pub unsafe extern "C" fn _hb_harfrust_shaper_face_data_create_rs( face: *mut hb_face_t, ) -> *mut c_void { let face_index = hb_face_get_index(face); - let face_blob = hb_face_reference_blob(face); - let blob_length = hb_blob_get_length(face_blob); - let blob_data: *const u8 = hb_blob_get_data(face_blob, null_mut()).cast(); - if blob_data.is_null() { - return null_mut(); - } - let face_data = std::slice::from_raw_parts(blob_data, blob_length as usize); + let hb_face = HbFace::new(face); + let table_fn = FontTableFunction::new(Arc::new(move |tag| { + let blob = hb_face.reference_table(tag); + if blob.is_null() { + return None; + } + if unsafe { hb_blob_get_length(blob) } == 0 { + unsafe { + hb_blob_destroy(blob); + } + return None; + } + Some(FontBlob::Shared(Arc::new(HbBlob(blob)))) + })); - let font_ref = match FontRef::from_index(face_data, face_index) { - Ok(f) => f, + let font = match Font::new(table_fn, face_index) { + Ok(font) => font, Err(_) => return null_mut(), }; - let shaper_data = ShaperData::new(&font_ref); - let hr_face_data = Box::new(HBHarfRustFaceData { - face_blob, - font_ref, - shaper_data, - }); + let hr_face_data = Box::new(HBHarfRustFaceData { font }); Box::into_raw(hr_face_data) as *mut c_void } @@ -88,15 +138,11 @@ pub unsafe extern "C" fn _hb_harfrust_shaper_face_data_create_rs( #[unsafe(no_mangle)] pub unsafe extern "C" fn _hb_harfrust_shaper_face_data_destroy_rs(data: *mut c_void) { let data = data as *mut HBHarfRustFaceData; - let hr_face_data = Box::from_raw(data); - let blob = hr_face_data.face_blob; - hb_blob_destroy(blob); + let _hr_face_data = Box::from_raw(data); } pub struct HBHarfRustFontData { - // Keep the instance alive because `shaper` borrows variation data from it. - _shaper_instance: Box, - shaper: Shaper<'static>, + instance: FontInstance, } struct HBHarfBuzzFontFuncs { @@ -173,7 +219,7 @@ impl FontFuncs for HBHarfBuzzFontFuncs { } } -fn font_to_shaper_instance(font: *mut hb_font_t, font_ref: &FontRef<'_>) -> ShaperInstance { +fn font_to_instance(font: *mut hb_font_t, font_ref: &Font) -> FontInstance { let mut num_coords: u32 = 0; let coords = unsafe { hb_font_get_var_coords_normalized(font, &mut num_coords) }; let coords = if coords.is_null() { @@ -182,7 +228,9 @@ fn font_to_shaper_instance(font: *mut hb_font_t, font_ref: &FontRef<'_>) -> Shap unsafe { std::slice::from_raw_parts(coords, num_coords as usize) } }; let coords = coords.iter().map(|&v| NormalizedCoord::from_bits(v as i16)); - ShaperInstance::from_coords(font_ref, coords) + FontInstance::builder(font_ref) + .normalized_coords(coords) + .build() } #[unsafe(no_mangle)] @@ -192,19 +240,10 @@ pub unsafe extern "C" fn _hb_harfrust_shaper_font_data_create_rs( ) -> *mut c_void { let face_data = face_data as *const HBHarfRustFaceData; - let font_ref = &(*face_data).font_ref; - let shaper_instance = Box::new(font_to_shaper_instance(font, font_ref)); - let shaper_instance_ref = &*(&*shaper_instance as *const _); - let shaper = (*face_data) - .shaper_data - .shaper(font_ref) - .instance(Some(shaper_instance_ref)) - .build(); + let instance = font_to_instance(font, &(*face_data).font); + let hr_font_data = HBHarfRustFontData { instance }; - let hr_font_data = Box::new(HBHarfRustFontData { - _shaper_instance: shaper_instance, - shaper: transmute::, harfrust::Shaper<'_>>(shaper), - }); + let hr_font_data = Box::new(hr_font_data); let hr_font_data_ptr = Box::into_raw(hr_font_data); hr_font_data_ptr as *mut c_void @@ -282,10 +321,13 @@ pub unsafe extern "C" fn _hb_harfrust_shape_plan_create_rs( }; let features = hb_feature_to_hr_feature(features, num_features); - let shaper = &(*font_data).shaper; - - let hr_shape_plan = - harfrust::ShapePlan::new(shaper, direction, script, language.as_ref(), &features); + let hr_shape_plan = harfrust::ShapePlan::new( + &(*font_data).instance, + direction, + script, + language.as_ref(), + &features, + ); let hr_shape_plan = Box::new(hr_shape_plan); Box::into_raw(hr_shape_plan) as *mut c_void } @@ -385,15 +427,13 @@ pub unsafe extern "C" fn _hb_harfrust_shape_rs( let mut y_scale = 0; hb_font_get_scale(font, &mut x_scale, &mut y_scale); let mut font_funcs = HBHarfBuzzFontFuncs { font }; - let glyphs = (*font_data).shaper.shape( - hr_buffer, - ShapeOptions::new() - .plan(shape_plan) - .scale_separate(Some((x_scale, y_scale))) - .point_size(ptem) - .features(&features) - .font_funcs(Some(&mut font_funcs)), - ); + let options = ShapeOptions::new() + .plan(shape_plan) + .scale_separate(Some((x_scale, y_scale))) + .point_size(ptem) + .features(&features) + .font_funcs(Some(&mut font_funcs)); + let glyphs = harfrust::shape(&(*font_data).instance, hr_buffer, options); hb_buffer_set_content_type( buffer, From 336958bd153a67d27e71d31d33a2d25d0b008d81 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Jun 2026 10:12:05 +0100 Subject: [PATCH 018/112] [GDEF] Slight speedup in mark-set lookup Avoids the nonnullptr overhead. 1% speedup in Duployan benchmark. --- src/OT/Layout/GDEF/GDEF.hh | 6 +++--- src/hb-ot-layout-gsubgpos.hh | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh index 01d72b129..e48354670 100644 --- a/src/OT/Layout/GDEF/GDEF.hh +++ b/src/OT/Layout/GDEF/GDEF.hh @@ -721,7 +721,7 @@ struct GDEFVersion1_2 out->version.minor = 3; c->plan->has_gdef_varstore = true; } else if (subset_markglyphsetsdef) { - out->version.minor = 2; + out->version.minor = 2; } else { out->version.minor = 0; c->serializer->revert (snapshot_version0); @@ -1003,14 +1003,14 @@ struct GDEF } HB_ALWAYS_INLINE - bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const + bool mark_set_may_cover (unsigned int set_index, hb_codepoint_t glyph_id) const { return #ifndef HB_NO_GDEF_CACHE // We can access arrayZ directly because of sanitize_lookup_props() guarantee. mark_glyph_sets.arrayZ[set_index].may_have (glyph_id) && #endif - table->mark_set_covers (set_index, glyph_id) + true ; } diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index df029ae79..2c4793170 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -851,7 +851,11 @@ struct hb_ot_apply_context_t : * match_props has the set index. */ if (match_props & LookupFlag::UseMarkFilteringSet) - return gdef_accel.mark_set_covers (match_props >> 16, info->codepoint); + { + unsigned set_index = match_props >> 16; + return gdef_accel.mark_set_may_cover (set_index, info->codepoint) && + gdef.mark_set_covers (set_index, info->codepoint); + } /* The second byte of match_props has the meaning * "ignore marks of attachment type different than From 5b665b336b93a775ea934783ea4c54cdef70417e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Jun 2026 23:30:06 +0100 Subject: [PATCH 019/112] [matcher] Leave inlining decision on next/prev to compiler Forcing this inline speeds up most benchmarks by a few percents, but at least for the Duployan benchmark, it slows it down by 40%. This is on Apple silicon. I had noticed that HarfRust was performing faster on this benchmark, and after lots of investigation, this force-inline seemed to be the culprit. --- src/hb-ot-layout-gsubgpos.hh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index 2c4793170..0437e449c 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -577,9 +577,6 @@ struct skipping_iterator_t return SKIP; } -#ifndef HB_OPTIMIZE_SIZE - HB_ALWAYS_INLINE -#endif bool next (unsigned *unsafe_to = nullptr) { auto *info = c->buffer->info; @@ -608,9 +605,6 @@ struct skipping_iterator_t *unsafe_to = end; return false; } -#ifndef HB_OPTIMIZE_SIZE - HB_ALWAYS_INLINE -#endif bool prev (unsigned *unsafe_from = nullptr) { auto *out_info = c->buffer->out_info; From 511df88b82e697cd2a0f1f0635787aa0b18bddbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:12:36 +0000 Subject: [PATCH 020/112] Bump actions/checkout from 6.0.3 to 7.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.3 to 7.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/df4cb1c069e1874edd31b4311f1884172cec0e10...9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/arm.yml | 2 +- .github/workflows/c++-versions.yml | 2 +- .github/workflows/configs-build.yml | 2 +- .github/workflows/coverity-scan.yml | 2 +- .github/workflows/crossbuild-mingw.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/linux.yml | 4 ++-- .github/workflows/macos.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/msys2.yml | 2 +- .github/workflows/rust.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- .github/workflows/scorecard.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/arm.yml b/.github/workflows/arm.yml index ca43192de..37aa885f5 100644 --- a/.github/workflows/arm.yml +++ b/.github/workflows/arm.yml @@ -15,7 +15,7 @@ jobs: container: image: devkitpro/devkitarm:latest steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Configure CMake run: | cmake -S . -B build \ diff --git a/.github/workflows/c++-versions.yml b/.github/workflows/c++-versions.yml index c4ce3a902..9e482b31f 100644 --- a/.github/workflows/c++-versions.yml +++ b/.github/workflows/c++-versions.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Install Dependencies run: | sudo apt-get update diff --git a/.github/workflows/configs-build.yml b/.github/workflows/configs-build.yml index 7bacbd773..f2bf2d0d9 100644 --- a/.github/workflows/configs-build.yml +++ b/.github/workflows/configs-build.yml @@ -26,7 +26,7 @@ jobs: name: ${{ matrix.config }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Create main.cc run: | cat < main.cc diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 92299d7f1..cbcbb3cca 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -11,7 +11,7 @@ jobs: latest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - run: sudo apt-get install gcc clang wget git curl pkg-config libfreetype6-dev libglib2.0-dev libicu-dev libgraphite2-dev diff --git a/.github/workflows/crossbuild-mingw.yml b/.github/workflows/crossbuild-mingw.yml index a55595e8e..6cd197468 100644 --- a/.github/workflows/crossbuild-mingw.yml +++ b/.github/workflows/crossbuild-mingw.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies @@ -64,7 +64,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Download artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 31003101d..7692a057b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 37d7f9eb1..7bd893cce 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: @@ -82,7 +82,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Download artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dababf3c9..3f17a0ca8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 4ee8f8fe3..04d208322 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index d12bd7d59..7ed6258f6 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -28,7 +28,7 @@ jobs: shell: msys2 {0} steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup MSYS2 uses: msys2/setup-msys2@cf96e00c0aab3788743aaf63b64146f0d383cee9 # v2 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0f8e0f1c3..ab020aaf3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 9070ae7fc..fcbdbf134 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index ea0f13ce3..4157a3fa7 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -29,7 +29,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index f9669c4aa..e5baaf83e 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies From 22d6df2a1945467e828ae0dca0f48dc9d9278d09 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Wed, 24 Jun 2026 03:00:52 -0600 Subject: [PATCH 021/112] Fix missing addition of idDelta when collecting cmap4 unicodes and mappings. (#6038) From the spec: The value c is the character code in question, and i is the segment index in which c appears. If the value obtained from the indexing operation is not 0 (which indicates missingGlyph), idDelta[i] is added to it to get the glyph index. The idDelta arithmetic is modulo 65536. --- src/hb-ot-cmap-table.hh | 1 + test/api/test-collect-unicodes.c | 59 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 6765c557f..0cc4d45f5 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -658,6 +658,7 @@ struct CmapSubtableFormat4 hb_codepoint_t gid = this->glyphIdArray[index]; if (unlikely (!gid)) continue; + gid = (gid + this->idDelta[i]) & 0xFFFFu; unicodes->add (codepoint); mapping->set (codepoint, gid); } diff --git a/test/api/test-collect-unicodes.c b/test/api/test-collect-unicodes.c index ee1e938cc..a4aea6286 100644 --- a/test/api/test-collect-unicodes.c +++ b/test/api/test-collect-unicodes.c @@ -49,6 +49,64 @@ test_collect_unicodes_format4 (void) hb_face_destroy (face); } +static void +test_collect_unicodes_format4_with_range_offsets_and_deltas (void) +{ + const char cmap_data[44] = { + 0, 0, 0, 1, /* cmap header */ + 0, 0, 0, 3, 0, 0, 0, 12, /* encoding records */ + /* cmap 4 */ + 0, 4, /* format */ + 0, 44, /* length */ + 0, 0, /* lang */ + 0, 2, /* segcountx2 */ + 0, 0, /* search range */ + 0, 0, /* entry selector */ + 0, 0, /* range shift */ + 0, 73, /* end code [0] */ + 0, 0, /* pad */ + 0, 70, /* start code [0] */ + 0, 5, /* id delta [0] */ + 0, 2, /* id range offset [0] */ + 0, 8, /* glyph id u70 */ + 0, 5, /* glyph id u71 */ + 0, 0, /* glyph id u72 */ + 0, 12, /* glyph id u73 */ + }; + + hb_blob_t* cmap = hb_blob_create(cmap_data, 44, HB_MEMORY_MODE_READONLY, 0, 0); + hb_face_t* face = hb_face_builder_create(); + hb_face_builder_add_table(face, HB_TAG('c', 'm', 'a', 'p'), cmap); + hb_blob_destroy(cmap); + + hb_set_t *codepoints = hb_set_create(); + hb_map_t *mapping = hb_map_create(); + hb_codepoint_t cp; + + hb_face_collect_unicodes (face, codepoints); + + cp = HB_SET_VALUE_INVALID; + g_assert_true (hb_set_next (codepoints, &cp)); + g_assert_cmpuint (70, ==, cp); + g_assert_true (hb_set_next (codepoints, &cp)); + g_assert_cmpuint (71, ==, cp); + g_assert_true (hb_set_next (codepoints, &cp)); + g_assert_cmpuint (73, ==, cp); + g_assert_false (hb_set_next (codepoints, &cp)); + + hb_set_clear(codepoints); + hb_face_collect_nominal_glyph_mapping(face, mapping, codepoints); + + g_assert_cmpuint (hb_map_get(mapping, 70), ==, 8 + 5); + g_assert_cmpuint (hb_map_get(mapping, 71), ==, 5 + 5); + g_assert_false (hb_map_has(mapping, 72)); + g_assert_cmpuint (hb_map_get(mapping, 73), ==, 12 + 5); + + hb_map_destroy(mapping); + hb_set_destroy (codepoints); + hb_face_destroy (face); +} + static void test_collect_unicodes_format12_notdef (void) { @@ -135,6 +193,7 @@ main (int argc, char **argv) hb_test_add (test_collect_unicodes_format4); hb_test_add (test_collect_unicodes_format12); hb_test_add (test_collect_unicodes_format12_notdef); + hb_test_add (test_collect_unicodes_format4_with_range_offsets_and_deltas); return hb_test_run(); } From f2210d5787230f542a1b2035322134b0b686c0ae Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 25 Jun 2026 16:17:55 +0200 Subject: [PATCH 022/112] [cmake] Add option for hb-gpu demo (#6040) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mirror Mesons gpu_demo feature in the CMake build with an AUTO/ON/OFF option. AUTO keeps the demo optional while reporting missing dependencies, ON makes missing dependencies fatal, and OFF skips probing and building the demo. Tested with meson test -C build. Assisted-by: OpenAI Codex --- CMakeLists.txt | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b5d4d7e1..5465fe63f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,18 @@ option(HB_BUILD_SUBSET "Build harfbuzz-subset" ON) option(HB_BUILD_RASTER "Build harfbuzz-raster" ON) option(HB_BUILD_VECTOR "Build harfbuzz-vector" ON) option(HB_BUILD_GPU "Build harfbuzz-gpu" ON) +set(HB_BUILD_GPU_DEMO "AUTO" CACHE STRING "Build hb-gpu demo tool (AUTO, ON, or OFF)") +set_property(CACHE HB_BUILD_GPU_DEMO PROPERTY STRINGS AUTO ON OFF) +string(TOUPPER "${HB_BUILD_GPU_DEMO}" HB_BUILD_GPU_DEMO) +if (NOT HB_BUILD_GPU_DEMO MATCHES "^(AUTO|ON|OFF)$") + message(FATAL_ERROR "HB_BUILD_GPU_DEMO must be AUTO, ON, or OFF") +endif () +if (HB_BUILD_GPU_DEMO STREQUAL "ON" AND NOT HB_BUILD_GPU) + message(FATAL_ERROR "HB_BUILD_GPU_DEMO is ON but HB_BUILD_GPU is OFF") +endif () +if (HB_BUILD_GPU_DEMO STREQUAL "ON" AND NOT HB_BUILD_UTILS) + message(FATAL_ERROR "HB_BUILD_GPU_DEMO is ON but HB_BUILD_UTILS is OFF") +endif () set(HB_HAVE_SUBSET ${HB_BUILD_SUBSET}) set(HB_HAVE_RASTER ${HB_BUILD_RASTER}) set(HB_HAVE_VECTOR ${HB_BUILD_VECTOR}) @@ -1031,7 +1043,7 @@ if (HB_BUILD_UTILS) target_link_libraries(hb-info harfbuzz-gobject harfbuzz) endif() - if (HB_BUILD_GPU) + if (HB_BUILD_GPU AND NOT HB_BUILD_GPU_DEMO STREQUAL "OFF") find_package(OpenGL QUIET) find_package(GLEW QUIET) find_package(glfw3 QUIET) @@ -1065,6 +1077,23 @@ if (HB_BUILD_UTILS) "${D3D11_LIBRARY}" "${D3DCOMPILER_LIBRARY}") endif () + else () + set(_hb_gpu_demo_missing_deps) + if (NOT OpenGL_FOUND) + list(APPEND _hb_gpu_demo_missing_deps OpenGL) + endif () + if (NOT GLEW_FOUND) + list(APPEND _hb_gpu_demo_missing_deps GLEW) + endif () + if (NOT glfw3_FOUND) + list(APPEND _hb_gpu_demo_missing_deps glfw3) + endif () + string(REPLACE ";" ", " _hb_gpu_demo_missing_deps "${_hb_gpu_demo_missing_deps}") + if (HB_BUILD_GPU_DEMO STREQUAL "ON") + message(FATAL_ERROR "HB_BUILD_GPU_DEMO is ON but missing dependencies: ${_hb_gpu_demo_missing_deps}") + else () + message(STATUS "Not building hb-gpu: missing dependencies: ${_hb_gpu_demo_missing_deps}") + endif () endif () endif () endif () From afe68c5c1c3b1d2379acac66d751633a23937638 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 26 Jun 2026 21:09:06 +0200 Subject: [PATCH 023/112] [rust] Always incoke cargo It can track dependencies and detect rebuild need better than meson. --- src/rust/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/meson.build b/src/rust/meson.build index ace3e4164..806930b55 100644 --- a/src/rust/meson.build +++ b/src/rust/meson.build @@ -55,6 +55,7 @@ harfbuzz_rust = custom_target( input: sources + ['Cargo.toml'], output: ['libharfbuzz_rust.a'], depends: [hb_rs], + build_always_stale: true, env: ['OUT_DIR=' + meson.current_build_dir(), 'RUSTFLAGS=' + rust_flags, ], From 590a72b249c833571eb718abaa6e418aa2e9055c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2026 10:12:29 +0000 Subject: [PATCH 024/112] Bump actions/setup-python from 6.2.0 to 6.3.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6.2.0 to 6.3.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/a309ff8b426b58ec0e2a45f0f869d46889d02405...ece7cb06caefa5fff74198d8649806c4678c61a1) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 6.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/crossbuild-mingw.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/rust.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/crossbuild-mingw.yml b/.github/workflows/crossbuild-mingw.yml index 6cd197468..463be41bf 100644 --- a/.github/workflows/crossbuild-mingw.yml +++ b/.github/workflows/crossbuild-mingw.yml @@ -38,7 +38,7 @@ jobs: zip \ ${{ matrix.PACKAGES }} - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7692a057b..ce3d497e3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -43,7 +43,7 @@ jobs: with: version: latest - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7bd893cce..aafa4207c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ jobs: zlib1g-dev \ help2man - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3f17a0ca8..a47334e8d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,7 @@ jobs: ninja \ pkgconf - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 04d208322..026d53595 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -34,7 +34,7 @@ jobs: variant: sccache key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.ARCH }} - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Setup MSVC diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ab020aaf3..fe9de1b56 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -45,7 +45,7 @@ jobs: zlib1g-dev \ bindgen - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index fcbdbf134..a7dd5d3c3 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -50,7 +50,7 @@ jobs: libicu-dev \ libgraphite2-dev - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index e5baaf83e..91a34d00e 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -31,7 +31,7 @@ jobs: libicu-dev \ libgraphite2-dev - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.12' - name: Install Python Dependencies From 46ca5be0bd8c10aff1934fc8b9632c295e8a67cc Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Jun 2026 17:44:05 +0200 Subject: [PATCH 025/112] [rust] Roll versions (#6042) --- src/rust/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index c91548da3..37bda356d 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -4,9 +4,9 @@ edition = "2021" rust-version = "1.87.0" [dependencies] -harfrust = { version = "0.10.0", features = ["experimental_font_api"], optional = true } +harfrust = { version = "0.11.0", features = ["experimental_font_api"], optional = true } # harfrust = { git = "https://github.com/harfbuzz/harfrust", optional = true } -read-fonts = "0.39.*" +read-fonts = "0.40.*" skrifa = { version = "0.*", optional = true } smallvec = "1.*" From 1904e60f7cf40565683cca7ef7e12d41b775cdca Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Jun 2026 23:09:03 +0200 Subject: [PATCH 026/112] [util/gpu] Guard D3D11 atlas allocation (#6043) The D3D11 demo atlas backend advanced its cursor and copied glyph data into the shadow buffer without checking the fixed atlas capacity. Long sessions could therefore write past the end of the shadow buffer once the atlas filled. Match the other demo atlas backends by failing before advancing the cursor when the requested glyph data does not fit. Testing: meson test -C build Assisted-by: OpenAI Codex --- util/gpu/demo-renderer-d3d11.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/gpu/demo-renderer-d3d11.cc b/util/gpu/demo-renderer-d3d11.cc index c29ec6255..def5dd696 100644 --- a/util/gpu/demo-renderer-d3d11.cc +++ b/util/gpu/demo-renderer-d3d11.cc @@ -167,6 +167,8 @@ struct demo_renderer_d3d11_t : demo_renderer_t backend.alloc = [](void *ctx_, const char *data, unsigned len_bytes) -> unsigned { auto *self = (demo_renderer_d3d11_t *) ctx_; unsigned len_texels = len_bytes / 8; + if (self->atlas.cursor + len_texels > self->atlas.capacity) + die ("Ran out of atlas memory"); unsigned offset = self->atlas.cursor; self->atlas.cursor += len_texels; const int16_t *src = (const int16_t *) data; From 760470e91e7ecce5392d3dffed7362a43197226d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Jun 2026 23:26:24 +0200 Subject: [PATCH 027/112] [raster] Avoid clip mask origin overflow (#6044) Clip mask extents can have extreme signed origins after malformed or heavily transformed outlines. Subtracting the surface origin in int overflowed for cases such as 0 - INT_MIN. Keep the mask-to-surface coordinate conversion in int64_t until after intersecting with the finite clip and surface bounds, then convert to unsigned only for proven in-range pixels. Add the minimized OSS-Fuzz seed to the raster fuzzer corpus. Testing: meson test -C build Fixes: https://oss-fuzz.com/testcase-detail/4621471331450880 Assisted-by: OpenAI Codex --- src/hb-raster-paint.cc | 24 +++++++++--------- ...inimized-hb-raster-fuzzer-4621471331450880 | Bin 0 -> 374 bytes 2 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4621471331450880 diff --git a/src/hb-raster-paint.cc b/src/hb-raster-paint.cc index d5bcdd8b3..24e3973f2 100644 --- a/src/hb-raster-paint.cc +++ b/src/hb-raster-paint.cc @@ -240,15 +240,15 @@ hb_raster_paint_finalize_path_clip (hb_raster_paint_t *c, } /* Convert mask extents from surface coordinates to clip-buffer coordinates. */ - int mask_x0 = mask_ext.x_origin - surf->extents.x_origin; - int mask_y0 = mask_ext.y_origin - surf->extents.y_origin; - int mask_x1 = mask_x0 + (int) mask_ext.width; - int mask_y1 = mask_y0 + (int) mask_ext.height; + int64_t mask_x0 = (int64_t) mask_ext.x_origin - (int64_t) surf->extents.x_origin; + int64_t mask_y0 = (int64_t) mask_ext.y_origin - (int64_t) surf->extents.y_origin; + int64_t mask_x1 = mask_x0 + mask_ext.width; + int64_t mask_y1 = mask_y0 + mask_ext.height; - int ix0_i = hb_max ((int) old_clip.min_x, hb_max (mask_x0, 0)); - int iy0_i = hb_max ((int) old_clip.min_y, hb_max (mask_y0, 0)); - int ix1_i = hb_min ((int) old_clip.max_x, hb_min (mask_x1, (int) w)); - int iy1_i = hb_min ((int) old_clip.max_y, hb_min (mask_y1, (int) h)); + int64_t ix0_i = hb_max ((int64_t) old_clip.min_x, hb_max (mask_x0, (int64_t) 0)); + int64_t iy0_i = hb_max ((int64_t) old_clip.min_y, hb_max (mask_y0, (int64_t) 0)); + int64_t ix1_i = hb_min ((int64_t) old_clip.max_x, hb_min (mask_x1, (int64_t) w)); + int64_t iy1_i = hb_min ((int64_t) old_clip.max_y, hb_min (mask_y1, (int64_t) h)); if (ix0_i >= ix1_i || iy0_i >= iy1_i) { @@ -269,11 +269,11 @@ hb_raster_paint_finalize_path_clip (hb_raster_paint_t *c, { for (unsigned y = iy0; y < iy1; y++) { - const uint8_t *mask_row = mask_buf + (unsigned) ((int) y - mask_y0) * mask_ext.stride; + const uint8_t *mask_row = mask_buf + (unsigned) ((int64_t) y - mask_y0) * mask_ext.stride; uint8_t *out_row = new_clip.alpha.arrayZ + y * new_clip.stride; unsigned row_min = ix1; unsigned row_max = ix0; - unsigned mx = (unsigned) ((int) ix0 - mask_x0); + unsigned mx = (unsigned) ((int64_t) ix0 - mask_x0); for (unsigned x = ix0; x < ix1; x++) { uint8_t a = mask_row[mx++]; @@ -300,13 +300,13 @@ hb_raster_paint_finalize_path_clip (hb_raster_paint_t *c, for (unsigned y = iy0; y < iy1; y++) { const uint8_t *old_row = old_clip.alpha.arrayZ + y * old_clip.stride; - const uint8_t *mask_row = mask_buf + (unsigned) ((int) y - mask_y0) * mask_ext.stride; + const uint8_t *mask_row = mask_buf + (unsigned) ((int64_t) y - mask_y0) * mask_ext.stride; uint8_t *out_row = new_clip.alpha.arrayZ + y * new_clip.stride; unsigned row_min = ix1; unsigned row_max = ix0; for (unsigned x = ix0; x < ix1; x++) { - unsigned mx = (unsigned) ((int) x - mask_x0); + unsigned mx = (unsigned) ((int64_t) x - mask_x0); uint8_t a = hb_raster_div255 (mask_row[mx] * old_row[x]); out_row[x] = a; if (a) diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4621471331450880 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4621471331450880 new file mode 100644 index 0000000000000000000000000000000000000000..9b8f17f6d36da50a4d781398a5475357960ced06 GIT binary patch literal 374 zcmZvX&q@MO6vlruV}I1tRa%L5l&r`yu#l*X3BygwM7d}yqAOt{eSr2og3zjM67&cK zZQHc&0fIJdhNy0LtYzQk`+e}8bMJ8)4Ts=%esxKt>$aNg@~Z%%Ve&7HY0r*$9g$@v zDToLpzm-z$c~FSk>GazDa<)*~lT5i`p*F8NXl7^z@M^PeQdPW3Ie^QdE zIJILx>3URR@PPpdFNU{ZcsbL{SqCplT?OGzcWfAEXkyxge7rHS9RHdrF0e9orCOEX zaPJAM2bg&Ew|`zguR!<~0`I5yNBgzNTeA;2LtpW~rr|_CR*J%*_Cf+G+81YFrwr*? j*w8sX2l)_|aOv+!LMjd+QRX08AAQd>3EP5EHwPF$?F3&` literal 0 HcmV?d00001 From 049a1d5ecc4e3349f64777eb55e299ee4984f30e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Jun 2026 15:38:20 -0600 Subject: [PATCH 028/112] [gvar] Fast-path cached shared tuple scalars This ports the shared-tuple scalar fast path from FreeType commit 7c952c1b0d9eac1681dad8de09f5bb193ac1ed40, adapted to HB's logic. --- src/hb-ot-layout-common.hh | 3 ++- src/hb-ot-var-common.hh | 22 ++++++++++++++++++---- src/hb-ot-var-gvar-table.hh | 3 ++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index f1288efab..09326dac3 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -2633,8 +2633,9 @@ struct hb_scalar_cache_t *cached_value = roundf(value * MULTIPLIER); } - private: + public: unsigned length; + private: mutable hb_atomic_t static_values[STATIC_LENGTH]; }; diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 0c1c4fc17..3db3efe84 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -115,6 +115,20 @@ struct TupleVariationHeader hb_scalar_cache_t *shared_tuple_scalar_cache = nullptr) const { unsigned tuple_index = tupleIndex; + unsigned int index = tuple_index & TupleIndex::TupleIndexMask; + + /* The gvar shared-tuple cache is clamped to the 12-bit tuple-index range. + * Only PrivatePointNumbers may accompany a cached shared-tuple index; any + * other flag sets a bit at or above 0x1000, making this range test fail. + */ + bool plain_shared_tuple = shared_tuple_scalar_cache && + (tuple_index & ~TupleIndex::PrivatePointNumbers) < shared_tuple_scalar_cache->length; + if (likely (plain_shared_tuple)) + { + float scalar; + if (likely (shared_tuple_scalar_cache->get (index, &scalar))) + return (double) scalar; + } const F2DOT14 *peak_tuple; @@ -127,10 +141,9 @@ struct TupleVariationHeader } else { - unsigned int index = tuple_index & TupleIndex::TupleIndexMask; // Inlined for performance - float scalar; - if (shared_tuple_scalar_cache && + if (!plain_shared_tuple && + shared_tuple_scalar_cache && shared_tuple_scalar_cache->get (index, &scalar)) { if (has_interm && (scalar != 0 && scalar != 1.f)) @@ -201,7 +214,7 @@ struct TupleVariationHeader scalar *= (double) v / peak; } if (shared_tuple_scalar_cache) - shared_tuple_scalar_cache->set (get_index (), scalar); + shared_tuple_scalar_cache->set (index, scalar); return scalar; } @@ -209,6 +222,7 @@ struct TupleVariationHeader bool has_intermediate () const { return tupleIndex & TupleIndex::IntermediateRegion; } bool has_private_points () const { return tupleIndex & TupleIndex::PrivatePointNumbers; } unsigned get_index () const { return tupleIndex & TupleIndex::TupleIndexMask; } + static constexpr unsigned max_shared_tuple_count = 0x1000u; protected: struct TupleIndex : HBUINT16 diff --git a/src/hb-ot-var-gvar-table.hh b/src/hb-ot-var-gvar-table.hh index da60de2e2..1715abcc9 100644 --- a/src/hb-ot-var-gvar-table.hh +++ b/src/hb-ot-var-gvar-table.hh @@ -589,7 +589,8 @@ struct gvar_GVAR hb_scalar_cache_t *create_cache () const { - return hb_scalar_cache_t::create (table->sharedTupleCount); + return hb_scalar_cache_t::create (hb_min ((unsigned) table->sharedTupleCount, + TupleVariationHeader::max_shared_tuple_count)); } static void destroy_cache (hb_scalar_cache_t *cache) From ebaec91a8ea0a97a95f7605055f48a4019e87683 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Jun 2026 15:50:21 -0600 Subject: [PATCH 029/112] Fix build --- src/hb-ot-var-common.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 3db3efe84..6f1ac56cb 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -222,7 +222,7 @@ struct TupleVariationHeader bool has_intermediate () const { return tupleIndex & TupleIndex::IntermediateRegion; } bool has_private_points () const { return tupleIndex & TupleIndex::PrivatePointNumbers; } unsigned get_index () const { return tupleIndex & TupleIndex::TupleIndexMask; } - static constexpr unsigned max_shared_tuple_count = 0x1000u; + static const unsigned max_shared_tuple_count = 0x1000u; protected: struct TupleIndex : HBUINT16 From 27c96db2286671ce8e00bc5f9e0a48da601a19dc Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Jun 2026 15:59:48 -0600 Subject: [PATCH 030/112] Fix build, second try --- src/hb-ot-var-common.hh | 2 +- src/hb-ot-var-gvar-table.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 6f1ac56cb..3db3efe84 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -222,7 +222,7 @@ struct TupleVariationHeader bool has_intermediate () const { return tupleIndex & TupleIndex::IntermediateRegion; } bool has_private_points () const { return tupleIndex & TupleIndex::PrivatePointNumbers; } unsigned get_index () const { return tupleIndex & TupleIndex::TupleIndexMask; } - static const unsigned max_shared_tuple_count = 0x1000u; + static constexpr unsigned max_shared_tuple_count = 0x1000u; protected: struct TupleIndex : HBUINT16 diff --git a/src/hb-ot-var-gvar-table.hh b/src/hb-ot-var-gvar-table.hh index 1715abcc9..12fefe96c 100644 --- a/src/hb-ot-var-gvar-table.hh +++ b/src/hb-ot-var-gvar-table.hh @@ -590,7 +590,7 @@ struct gvar_GVAR hb_scalar_cache_t *create_cache () const { return hb_scalar_cache_t::create (hb_min ((unsigned) table->sharedTupleCount, - TupleVariationHeader::max_shared_tuple_count)); + +TupleVariationHeader::max_shared_tuple_count)); } static void destroy_cache (hb_scalar_cache_t *cache) From 4509695c7873a8ff9320613bb8cdd65426436970 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 30 Jun 2026 00:37:16 +0200 Subject: [PATCH 031/112] [gvar] Avoid null checks in tuple scalar cache path (#6045) Normalize a missing gvar scalar cache to the Null cache before the tuple loop, so calculate_scalar can use the cache length directly in its fast path. Keep the fallback from querying a zero-length cache, since that would otherwise be interpreted as a cached zero scalar. --- src/hb-ot-var-common.hh | 7 +++---- src/hb-ot-var-gvar-table.hh | 5 ++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 3db3efe84..e9ba284ca 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -112,7 +112,7 @@ struct TupleVariationHeader HB_ALWAYS_INLINE double calculate_scalar (hb_array_t coords, unsigned int coord_count, const hb_array_t shared_tuples, - hb_scalar_cache_t *shared_tuple_scalar_cache = nullptr) const + hb_scalar_cache_t *shared_tuple_scalar_cache = (hb_scalar_cache_t *) &Null(hb_scalar_cache_t)) const { unsigned tuple_index = tupleIndex; unsigned int index = tuple_index & TupleIndex::TupleIndexMask; @@ -121,8 +121,7 @@ struct TupleVariationHeader * Only PrivatePointNumbers may accompany a cached shared-tuple index; any * other flag sets a bit at or above 0x1000, making this range test fail. */ - bool plain_shared_tuple = shared_tuple_scalar_cache && - (tuple_index & ~TupleIndex::PrivatePointNumbers) < shared_tuple_scalar_cache->length; + bool plain_shared_tuple = (tuple_index & ~TupleIndex::PrivatePointNumbers) < shared_tuple_scalar_cache->length; if (likely (plain_shared_tuple)) { float scalar; @@ -143,7 +142,7 @@ struct TupleVariationHeader { float scalar; if (!plain_shared_tuple && - shared_tuple_scalar_cache && + shared_tuple_scalar_cache->length && shared_tuple_scalar_cache->get (index, &scalar)) { if (has_interm && (scalar != 0 && scalar != 1.f)) diff --git a/src/hb-ot-var-gvar-table.hh b/src/hb-ot-var-gvar-table.hh index 12fefe96c..af1e6b860 100644 --- a/src/hb-ot-var-gvar-table.hh +++ b/src/hb-ot-var-gvar-table.hh @@ -722,6 +722,9 @@ struct gvar_GVAR bool phantom_only = false) const { if (unlikely (glyph >= glyphCount)) return true; + hb_scalar_cache_t *scalar_cache = gvar_cache ? + gvar_cache : + (hb_scalar_cache_t *) &Null(hb_scalar_cache_t); hb_bytes_t var_data_bytes = table->get_glyph_var_data_bytes (table.get_blob (), glyphCount, glyph); if (!var_data_bytes.as ()->has_data ()) return true; @@ -761,7 +764,7 @@ struct gvar_GVAR do { float scalar = iterator.current_tuple->calculate_scalar (coords, num_coords, shared_tuples, - gvar_cache); + scalar_cache); if (scalar == 0.f) continue; From 6a0bcf4318be78bcd0066c28396556a1e55fc8a1 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 2 Jul 2026 14:01:19 -0600 Subject: [PATCH 032/112] [VARC] Fix test fonts glyphDataFormat (#6046) --- test/api/fonts/varc-6868.ttf | Bin 8784 -> 8784 bytes test/api/fonts/varc-ac00-ac01.ttf | Bin 2748 -> 2748 bytes test/api/fonts/varc-ac01-conditional.ttf | Bin 2688 -> 2688 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/api/fonts/varc-6868.ttf b/test/api/fonts/varc-6868.ttf index 6041d6cc1f179e0354957e4c0a978e6e77281839..f9eb5ced04582c7986989b42c473745ad4548d96 100644 GIT binary patch delta 23 fcmccMa=~RnBBTDqq+-UPiPy9l88$O9`Y8ecZJYo@^i>IYB& delta 23 ecmZn=Z4jN1$jCl1shIK0#B17&jGLJl>o@^i>IYB& From f1de1d8cf118f3f75cf1d2432487e094638feea1 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 11:07:00 -0600 Subject: [PATCH 033/112] [rust] Fix cyclical reference issue with harfrust shaper (#6048) Face-data doesn't need to (and should not) hold a reference to face. Fixes https://github.com/harfbuzz/harfbuzz/issues/6047 --- src/rust/shape.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/rust/shape.rs b/src/rust/shape.rs index 384592388..781dcf1d4 100644 --- a/src/rust/shape.rs +++ b/src/rust/shape.rs @@ -61,7 +61,7 @@ struct HbFace(*mut hb_face_t); impl HbFace { unsafe fn new(face: *mut hb_face_t) -> Self { - Self(hb_face_reference(face)) + Self(face) } fn reference_table(&self, tag: Tag) -> *mut hb_blob_t { @@ -69,14 +69,6 @@ impl HbFace { } } -impl Drop for HbFace { - fn drop(&mut self) { - unsafe { - hb_face_destroy(self.0); - } - } -} - unsafe impl Send for HbFace {} unsafe impl Sync for HbFace {} From fe9501b08d1bf40bf5c6285d336157aa82b29e40 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 19:52:38 -0600 Subject: [PATCH 034/112] [rust] Update harfrust to 0.12.0, read-fonts to 0.41.* (#6049) harfrust 0.12.0 fixes sub-font-unit GPOS advance/placement and AAT trak tracking differences against the "ot" shaper on variable fonts (harfbuzz/harfrust#402, #403, #404), by keeping variation-index and trak deltas fractional instead of pre-rounding them to whole font units before scaling. read-fonts is bumped to 0.41.* to match harfrust's requirement; the currently released skrifa (0.44.0) already depends on read-fonts ^0.41.0, so the dependency graph resolves to a single read-fonts version. Verified against the published crates.io packages (harfrust 0.12.0, read-fonts 0.41.0, skrifa 0.44.0): `meson test -C build` shape and api suites pass, and `hb-shape --shaper ot` / `--shaper harfrust` now agree exactly on SFNSItalic.ttf across variation instances, where they previously differed by sub-font-unit amounts. Assisted-by: Claude Co-authored-by: Claude Opus 4.8 (1M context) --- src/rust/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 37bda356d..31842c10c 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -4,9 +4,9 @@ edition = "2021" rust-version = "1.87.0" [dependencies] -harfrust = { version = "0.11.0", features = ["experimental_font_api"], optional = true } +harfrust = { version = "0.12.0", features = ["experimental_font_api"], optional = true } # harfrust = { git = "https://github.com/harfbuzz/harfrust", optional = true } -read-fonts = "0.40.*" +read-fonts = "0.41.*" skrifa = { version = "0.*", optional = true } smallvec = "1.*" From 79121f627703417b7a7fa0e0fbefdbf34969ffd0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 21:00:50 -0600 Subject: [PATCH 035/112] [subset/cff2] Parse vsindexdict in the subset accelerator private dicts The subset-side private-dict opset never handled OpCode_vsindexdict, so accelerator_subset_t's privateDicts[fd].ivs always stayed 0 and charstring interpretation during subsetting started from the wrong variation-store index for any FD whose Private dict declares a non-zero vsindex. Mirror what cff2_private_dict_opset_t does; the op bytes are still recorded so the verbatim-copy path is unchanged. --- src/hb-ot-cff2-table.hh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hb-ot-cff2-table.hh b/src/hb-ot-cff2-table.hh index 061863835..e46ea5a87 100644 --- a/src/hb-ot-cff2-table.hh +++ b/src/hb-ot-cff2-table.hh @@ -346,6 +346,12 @@ struct cff2_private_dict_opset_subset_t : dict_opset_t env.clear_args (); break; + case OpCode_vsindexdict: + env.process_vsindex (); + dictval.ivs = env.get_ivs (); + env.clear_args (); + break; + default: SUPER::process_op (op, env); if (!env.argStack.is_empty ()) return; From 0ad785e97e0a6eadf13e448540ed5aa955387c36 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 21:03:12 -0600 Subject: [PATCH 036/112] [subset/cff2] Persist blend-encoder param across private-dict opstrs The pinned private-dict serializer rebuilt its blend-encoder param for every opstr, so an ivs recorded from a vsindexdict opstr was gone by the time later opstrs' blends were flattened; dicts with a non-zero vsindex were blended against VarData 0's scalars. Hoist the param into the serializer (one instance per private dict) so it survives the whole dict. --- src/hb-subset-cff2.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index 262eeb1ab..9514a450f 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -448,7 +448,7 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t const CFF::CFF2ItemVariationStore* varStore_, hb_array_t normalized_coords_) : desubroutinize (desubroutinize_), drop_hints (drop_hints_), pinned (pinned_), - varStore (varStore_), normalized_coords (normalized_coords_) {} + param (nullptr, varStore_, normalized_coords_) {} bool serialize (hb_serialize_context_t *c, const op_str_t &opstr, @@ -469,9 +469,11 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t if (pinned) { - // Reinterpret opstr and process blends. + /* Reinterpret opstr and process blends. The param persists across + * this dict's opstrs, so that an ivs set by a vsindexdict opstr is + * still in effect when a later opstr's blends are flattened. */ cff2_priv_dict_interp_env_t env {hb_ubytes_t (opstr.ptr, opstr.length)}; - cff2_private_blend_encoder_param_t param (c, varStore, normalized_coords); + param.c = c; dict_interpreter_t interp (env); return_trace (interp.interpret (param)); } @@ -483,8 +485,7 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t const bool desubroutinize; const bool drop_hints; const bool pinned; - const CFF::CFF2ItemVariationStore* varStore; - hb_array_t normalized_coords; + mutable cff2_private_blend_encoder_param_t param; }; From bfbc6dfd2fceb92e5260a4bc4c93983de5aecb1a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 21:09:11 -0600 Subject: [PATCH 037/112] [subset/cff2] Compute per-VarData blend transforms for partial instancing Port of fontTools' instantiateCFF2 (fonttools/fonttools#3506) design, with a simplification: the instancing solver acts on regions independently of per-blend delta values, so instead of lifting every blend's deltas into the store and reading them back, instance each VarData once with identity delta rows. The surviving tuples then form a fixed linear map from old per-region deltas to new per-region deltas; the fold-into-default part is the old store's region scalars at the new default location. Dormant so far: computed for partial-instancing requests but not yet consumed; blends are still (wrongly) fully flattened. --- src/hb-subset-cff2.cc | 183 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index 9514a450f..1fe32f03e 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -30,6 +30,7 @@ #include "hb-open-type.hh" #include "hb-ot-cff2-table.hh" +#include "hb-ot-var-common.hh" #include "hb-set.h" #include "hb-subset-plan.hh" #include "hb-subset-cff-common.hh" @@ -489,6 +490,177 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t }; +/* + * Partial instancing (some axes pinned or limited, others kept). + * + * This is a port of fontTools' instantiateCFF2 (fonttools/fonttools#3506), + * with one simplification: the variation-store instancing solver acts on + * regions independently of the per-blend delta values, so instead of lifting + * every blend's deltas into the store, instancing it, and reading the rows + * back, we instance each VarData once with identity delta rows. The + * instantiated tuples then give, per VarData, a fixed linear map from old + * per-region deltas to new per-region deltas. The contribution that folds + * into each blend's default value is the old store's region scalars + * evaluated at the new default location (plan->normalized_coords); the + * surviving rebased regions all evaluate to zero there. + */ +struct cff2_instancing_plan_t +{ + struct vardata_transform_t + { + /* new_deltas[j] = Σ_i matrix[j][i] * old_deltas[i] */ + hb_vector_t> matrix; + /* Default-value fold-in scalars, one per old region: the old store's + * region scalars at the new default location. */ + hb_vector_t gains; + /* Index into the new global region list, per new region. */ + hb_vector_t region_indices; + unsigned new_major = 0; + bool alive () const { return matrix.length; } + }; + + hb_vector_t transforms; /* per old VarData (vsindex) */ + hb_vector_t> new_regions; /* global region list */ + unsigned new_major_count = 0; + + bool has_variations () const { return new_major_count; } + + const vardata_transform_t *get_transform (unsigned major) const + { return major < transforms.length ? &transforms.arrayZ[major] : nullptr; } + + /* The new vsindex a private dict's (or charstring's) old ivs maps to; + * dead VarDatas fall back to 0, their blends having become static. */ + unsigned remap_ivs (unsigned old_ivs) const + { + const vardata_transform_t *t = get_transform (old_ivs); + return (t && t->alive ()) ? t->new_major : 0; + } + + double fold_deltas (unsigned old_ivs, hb_array_t deltas) const + { + const vardata_transform_t *t = get_transform (old_ivs); + if (unlikely (!t || t->gains.length != deltas.length)) return 0.; + double v = 0.; + for (unsigned i = 0; i < deltas.length; i++) + v += (double) t->gains.arrayZ[i] * deltas.arrayZ[i].to_real (); + return v; + } + + bool create (const CFF2ItemVariationStore *cff2VarStore, + const hb_subset_plan_t *plan) + { + const OT::ItemVariationStore &varStore = cff2VarStore->varStore; + unsigned major_count = varStore.get_sub_table_count (); + if (!transforms.resize (major_count)) return false; + + hb_vector_t> orig_regions; + if (!varStore.get_region_list ().get_var_regions (plan->axes_old_index_tag_map, orig_regions)) + return false; + + /* Instance each VarData with identity delta rows; the surviving tuples' + * delta columns are the old-region → new-region transform. */ + hb_vector_t tuple_vars_list; + if (!tuple_vars_list.resize (major_count)) return false; + OT::optimize_scratch_t scratch; + for (unsigned m = 0; m < major_count; m++) + { + const OT::VarData &var_data = varStore.get_sub_table (m); + unsigned k = var_data.get_region_index_count (); + vardata_transform_t &t = transforms.arrayZ[m]; + + if (!t.gains.resize_exact (k)) return false; + varStore.get_region_scalars (m, plan->normalized_coords.arrayZ, + plan->normalized_coords.length, + t.gains.arrayZ, k); + + OT::tuple_variations_t &tuples = tuple_vars_list.arrayZ[m]; + for (unsigned r = 0; r < k; r++) + { + OT::tuple_delta_t tuple; + if (!tuple.deltas_x.resize (k) || + !tuple.indices.resize (k)) + return false; + for (unsigned i = 0; i < k; i++) + tuple.indices.arrayZ[i] = true; + tuple.deltas_x.arrayZ[r] = 1.f; + unsigned region_index = var_data.get_region_index (r); + if (unlikely (region_index >= orig_regions.length)) return false; + tuple.axis_tuples = orig_regions.arrayZ[region_index]; + if (unlikely (tuple.axis_tuples.in_error ())) return false; + tuples.tuple_vars.push (std::move (tuple)); + } + if (unlikely (tuples.tuple_vars.in_error ())) return false; + + if (!tuples.instantiate (plan->axes_location, plan->axes_triple_distances, scratch)) + return false; + } + + /* Build the new global region list: surviving original regions first, + * in their original order, then solver-split new regions in order of + * appearance (fontTools' rebuildRegions). Keys hash by content, so + * pointers into different owners compare fine. */ + hb_hashmap_t*, unsigned> region_idx_map; + hb_vector_t*> region_ptrs; + for (const auto &tuples : tuple_vars_list) + for (const auto &tuple : tuples.tuple_vars) + if (!region_idx_map.has (&tuple.axis_tuples)) + if (unlikely (!region_idx_map.set (&tuple.axis_tuples, (unsigned) -1))) + return false; + for (const auto &r : orig_regions) + { + unsigned *idx; + if (region_idx_map.has (&r, &idx) && *idx == (unsigned) -1) + { + if (unlikely (!region_idx_map.set (&r, region_ptrs.length))) return false; + region_ptrs.push (&r); + } + } + for (const auto &tuples : tuple_vars_list) + for (const auto &tuple : tuples.tuple_vars) + { + unsigned *idx; + if (region_idx_map.has (&tuple.axis_tuples, &idx) && *idx == (unsigned) -1) + { + if (unlikely (!region_idx_map.set (&tuple.axis_tuples, region_ptrs.length))) return false; + region_ptrs.push (&tuple.axis_tuples); + } + } + if (unlikely (region_ptrs.in_error ())) return false; + + /* Fill in per-VarData transforms and assign new vsindexes. */ + for (unsigned m = 0; m < major_count; m++) + { + vardata_transform_t &t = transforms.arrayZ[m]; + const auto &tuples = tuple_vars_list.arrayZ[m]; + unsigned k = t.gains.length; + for (const auto &tuple : tuples.tuple_vars) + { + if (unlikely (tuple.deltas_x.length != k)) return false; + unsigned *idx; + if (unlikely (!region_idx_map.has (&tuple.axis_tuples, &idx))) return false; + t.region_indices.push (*idx); + hb_vector_t col; + if (unlikely (!col.resize_exact (k))) return false; + for (unsigned i = 0; i < k; i++) + col.arrayZ[i] = tuple.deltas_x.arrayZ[i]; + t.matrix.push (std::move (col)); + } + if (unlikely (t.matrix.in_error () || t.region_indices.in_error ())) return false; + if (t.alive ()) + t.new_major = new_major_count++; + } + + if (!new_regions.resize (region_ptrs.length)) return false; + for (unsigned i = 0; i < region_ptrs.length; i++) + { + new_regions.arrayZ[i] = *region_ptrs.arrayZ[i]; + if (unlikely (new_regions.arrayZ[i].in_error ())) return false; + } + + return true; + } +}; + namespace OT { struct cff2_subset_plan { @@ -510,6 +682,14 @@ struct cff2_subset_plan desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE || pinned; // For instancing we need this path + /* Partial instancing: some axes pinned or limited, others kept. */ + partial_instancing = plan->normalized_coords && !plan->all_axes_pinned && + acc.varStore != &Null (CFF2ItemVariationStore) && + acc.varStore->varStore.get_sub_table_count (); + if (partial_instancing && + unlikely (!instancing.create (acc.varStore, plan))) + return false; + /* Enable command capture for CFF2→CFF1 conversion (for specialization) */ capture_commands = pinned; @@ -604,6 +784,9 @@ struct cff2_subset_plan bool drop_hints = false; bool desubroutinize = false; + bool partial_instancing = false; + cff2_instancing_plan_t instancing; + unsigned min_charstrings_off_size = 0; hb_array_t normalized_coords; // For instantiation From 46b683188210d175184340c9ecaa047ca975603e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 21:37:54 -0600 Subject: [PATCH 038/112] [subset/cff2] Support partial instancing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rewrite charstring and private-dict blends against the instanced store: each value's default absorbs the folded (pinned-away) contribution — the old store's region scalars at the new default location — and its deltas are mapped onto the new region list through the per-VarData transform. Blend groups are re-chunked if needed to respect the 513 argument-stack limit, since range limiting can split regions and grow the region count. Only VarDatas that are still variable and actually referenced by the retained charstrings' or private dicts' blends survive, mirroring fontTools; vsindex ops are remapped accordingly, dropped when implied by the FD's private dict, and re-emitted as a charstring prefix when not. If no VarData survives, the store and the vstore top-dict op are dropped and all blends dissolve into static values. The rebuilt CFF2ItemVariationStore carries itemless VarDatas — just region indexes — as blend deltas live in the charstrings. Verified against fontTools varLib.instancer on AdobeVFPrototype, SourceSerif4Variable and fontTools' CFF2Instancer test fonts: outputs are value-identical or closer to the original than fontTools' own. Fixes https://github.com/harfbuzz/harfbuzz/issues/4700 Closes https://github.com/harfbuzz/harfbuzz/pull/4710 --- src/hb-cff2-interp-cs.hh | 6 +- src/hb-subset-cff-common.hh | 7 + src/hb-subset-cff2.cc | 821 ++++++++++++++++++++++++++++-------- 3 files changed, 649 insertions(+), 185 deletions(-) diff --git a/src/hb-cff2-interp-cs.hh b/src/hb-cff2-interp-cs.hh index 6a338b462..241524215 100644 --- a/src/hb-cff2-interp-cs.hh +++ b/src/hb-cff2-interp-cs.hh @@ -78,7 +78,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t num_coords = num_coords_; varStore = acc.varStore; do_blend = num_coords && varStore->size; - set_ivs (acc.privateDicts[fd].ivs); + orig_ivs = acc.privateDicts[fd].ivs; + set_ivs (orig_ivs); } ~cff2_cs_interp_env_t () @@ -179,6 +180,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t void set_region_count (unsigned int region_count_) { region_count = region_count_; } unsigned int get_ivs () const { return ivs; } void set_ivs (unsigned int ivs_) { ivs = ivs_; } + /* The FD's private-dict ivs, before any vsindex op in the charstring. */ + unsigned int get_orig_ivs () const { return orig_ivs; } bool seen_vsindex () const { return seen_vsindex_; } double blend_deltas (hb_array_t deltas) const @@ -204,6 +207,7 @@ struct cff2_cs_interp_env_t : cs_interp_env_t const CFF2ItemVariationStore *varStore; unsigned int region_count; unsigned int ivs; + unsigned int orig_ivs; hb_vector_t *scalars = nullptr; hb_atomic_t *> *cached_scalars_vector = nullptr; bool do_blend; diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh index 3140b9ca3..7abeafa1d 100644 --- a/src/hb-subset-cff-common.hh +++ b/src/hb-subset-cff-common.hh @@ -334,6 +334,8 @@ struct cs_command_t typedef hb_vector_t *cs_command_vec_t; +struct cff2_instancing_plan_t; + struct flatten_param_t { flatten_param_t (str_buff_t &flatStr_, @@ -346,6 +348,11 @@ struct flatten_param_t bool drop_hints; const hb_subset_plan_t *plan; cs_command_vec_t commands; /* Optional: capture parsed commands for specialization */ + + /* CFF2 partial instancing: when set, blends are rewritten against the + * instanced variation store instead of being copied or flattened. */ + const cff2_instancing_plan_t *instancer = nullptr; + bool emitted_blend = false; }; template diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index 1fe32f03e..8ca190ee0 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -39,6 +39,325 @@ using namespace CFF; +namespace CFF { + +/* + * Partial instancing (some axes pinned or limited, others kept). + * + * This is a port of fontTools' instantiateCFF2 (fonttools/fonttools#3506), + * with one simplification: the variation-store instancing solver acts on + * regions independently of the per-blend delta values, so instead of lifting + * every blend's deltas into the store, instancing it, and reading the rows + * back, we instance each VarData once with identity delta rows. The + * instantiated tuples then give, per VarData, a fixed linear map from old + * per-region deltas to new per-region deltas. The contribution that folds + * into each blend's default value is the old store's region scalars + * evaluated at the new default location (plan->normalized_coords); the + * surviving rebased regions all evaluate to zero there. + * + * Use: create (), then note_use () for every blend the retained charstrings + * and private dicts hold, then finalize (); only VarDatas that are both + * still variable and actually used survive into the new store. + */ +struct cff2_instancing_plan_t +{ + struct vardata_transform_t + { + /* new_deltas[j] = Σ_i matrix[j][i] * old_deltas[i] */ + hb_vector_t> matrix; + /* Default-value fold-in scalars, one per old region: the old store's + * region scalars at the new default location. */ + hb_vector_t gains; + /* Surviving regions, parallel to matrix rows. */ + hb_vector_t> regions; + /* Index into the new global region list, per new region (finalize). */ + hb_vector_t region_indices; + unsigned new_major = 0; + bool alive_ = false; + bool alive () const { return alive_; } + + /* One value's delta for new region j, from its old per-region deltas. */ + double transform_delta (unsigned j, hb_array_t deltas) const + { + const hb_vector_t &col = matrix.arrayZ[j]; + double d = 0.; + unsigned count = hb_min (col.length, deltas.length); + for (unsigned c = 0; c < count; c++) + d += (double) col.arrayZ[c] * deltas.arrayZ[c].to_real (); + return d; + } + }; + + hb_vector_t transforms; /* per old VarData (vsindex) */ + hb_vector_t> new_regions; /* global region list */ + hb_set_t used_majors; + unsigned new_major_count = 0; + + bool has_variations () const { return new_major_count; } + + const vardata_transform_t *get_transform (unsigned major) const + { return major < transforms.length ? &transforms.arrayZ[major] : nullptr; } + + /* Record that a retained blend references this VarData. */ + void note_use (unsigned major) { used_majors.add (major); } + + /* The new vsindex a private dict's (or charstring's) old ivs maps to; + * dead VarDatas fall back to 0, their blends having become static. */ + unsigned remap_ivs (unsigned old_ivs) const + { + const vardata_transform_t *t = get_transform (old_ivs); + return (t && t->alive ()) ? t->new_major : 0; + } + + double fold_deltas (unsigned old_ivs, hb_array_t deltas) const + { + const vardata_transform_t *t = get_transform (old_ivs); + if (unlikely (!t || t->gains.length != deltas.length)) return 0.; + double v = 0.; + for (unsigned i = 0; i < deltas.length; i++) + v += (double) t->gains.arrayZ[i] * deltas.arrayZ[i].to_real (); + return v; + } + + bool create (const CFF2ItemVariationStore *cff2VarStore, + const hb_subset_plan_t *plan) + { + const OT::ItemVariationStore &varStore = cff2VarStore->varStore; + unsigned major_count = varStore.get_sub_table_count (); + if (!transforms.resize (major_count)) return false; + + if (!varStore.get_region_list ().get_var_regions (plan->axes_old_index_tag_map, orig_regions)) + return false; + + /* Instance each VarData with identity delta rows; the surviving tuples' + * delta columns are the old-region → new-region transform. */ + OT::optimize_scratch_t scratch; + for (unsigned m = 0; m < major_count; m++) + { + const OT::VarData &var_data = varStore.get_sub_table (m); + unsigned k = var_data.get_region_index_count (); + vardata_transform_t &t = transforms.arrayZ[m]; + + if (!t.gains.resize_exact (k)) return false; + varStore.get_region_scalars (m, plan->normalized_coords.arrayZ, + plan->normalized_coords.length, + t.gains.arrayZ, k); + + OT::tuple_variations_t tuples; + for (unsigned r = 0; r < k; r++) + { + OT::tuple_delta_t tuple; + if (!tuple.deltas_x.resize (k) || + !tuple.indices.resize (k)) + return false; + for (unsigned i = 0; i < k; i++) + tuple.indices.arrayZ[i] = true; + tuple.deltas_x.arrayZ[r] = 1.f; + unsigned region_index = var_data.get_region_index (r); + if (unlikely (region_index >= orig_regions.length)) return false; + tuple.axis_tuples = orig_regions.arrayZ[region_index]; + if (unlikely (tuple.axis_tuples.in_error ())) return false; + tuples.tuple_vars.push (std::move (tuple)); + } + if (unlikely (tuples.tuple_vars.in_error ())) return false; + + if (!tuples.instantiate (plan->axes_location, plan->axes_triple_distances, scratch)) + return false; + + for (auto &tuple : tuples.tuple_vars) + { + if (unlikely (tuple.deltas_x.length != k)) return false; + hb_vector_t col; + if (unlikely (!col.resize_exact (k))) return false; + for (unsigned i = 0; i < k; i++) + col.arrayZ[i] = tuple.deltas_x.arrayZ[i]; + t.matrix.push (std::move (col)); + t.regions.push (std::move (tuple.axis_tuples)); + } + if (unlikely (t.matrix.in_error () || t.regions.in_error ())) return false; + } + + return true; + } + + /* Decide which VarDatas survive, number them, and build the new global + * region list: surviving original regions first, in their original order, + * then solver-split new regions in order of appearance (fontTools' + * rebuildRegions + prune_regions). */ + bool finalize () + { + for (unsigned m = 0; m < transforms.length; m++) + { + vardata_transform_t &t = transforms.arrayZ[m]; + t.alive_ = t.matrix.length && used_majors.has (m); + if (t.alive_) + t.new_major = new_major_count++; + } + + /* Keys hash by content, so pointers into different owners compare fine. */ + hb_hashmap_t*, unsigned> region_idx_map; + hb_vector_t*> region_ptrs; + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + for (const auto ®ion : t.regions) + if (!region_idx_map.has (®ion)) + if (unlikely (!region_idx_map.set (®ion, (unsigned) -1))) + return false; + } + for (const auto &r : orig_regions) + { + unsigned *idx; + if (region_idx_map.has (&r, &idx) && *idx == (unsigned) -1) + { + if (unlikely (!region_idx_map.set (&r, region_ptrs.length))) return false; + region_ptrs.push (&r); + } + } + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + for (const auto ®ion : t.regions) + { + unsigned *idx; + if (region_idx_map.has (®ion, &idx) && *idx == (unsigned) -1) + { + if (unlikely (!region_idx_map.set (®ion, region_ptrs.length))) return false; + region_ptrs.push (®ion); + } + } + } + if (unlikely (region_ptrs.in_error ())) return false; + + for (vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + for (const auto ®ion : t.regions) + { + unsigned *idx; + if (unlikely (!region_idx_map.has (®ion, &idx))) return false; + t.region_indices.push (*idx); + } + if (unlikely (t.region_indices.in_error ())) return false; + } + + if (!new_regions.resize (region_ptrs.length)) return false; + for (unsigned i = 0; i < region_ptrs.length; i++) + { + new_regions.arrayZ[i] = *region_ptrs.arrayZ[i]; + if (unlikely (new_regions.arrayZ[i].in_error ())) return false; + } + + return true; + } + + /* Serialize the instanced store: a CFF2ItemVariationStore whose VarDatas + * carry no items, just region indexes (blend deltas live in charstrings). + * Laid out manually since all sizes are known up front. */ + bool serialize_var_store (hb_serialize_context_t *c, + const hb_vector_t &axis_tags) const + { + unsigned data_count = new_major_count; + unsigned header_size = 2 + 4 + 2 + 4 * data_count; + + unsigned offset = header_size; + hb_vector_t data_offsets; + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + data_offsets.push (offset); + offset += 6 + 2 * t.region_indices.length; + } + if (unlikely (data_offsets.in_error () || data_offsets.length != data_count)) + return false; + unsigned regions_offset = offset; + unsigned total = offset + 4 + new_regions.length * axis_tags.length * 6; + if (unlikely (total > 0xFFFFu)) return false; + + HBUINT16 *size_field = c->allocate_size (HBUINT16::static_size); + if (unlikely (!size_field)) return false; + *size_field = total; + + char *header = c->allocate_size (header_size); + if (unlikely (!header)) return false; + * (HBUINT16 *) (header + 0) = 1; /* format */ + * (HBUINT32 *) (header + 2) = regions_offset; + * (HBUINT16 *) (header + 6) = data_count; + for (unsigned i = 0; i < data_count; i++) + * (HBUINT32 *) (header + 8 + 4 * i) = data_offsets.arrayZ[i]; + + for (const vardata_transform_t &t : transforms) + { + if (!t.alive ()) continue; + unsigned k = t.region_indices.length; + HBUINT16 *v = (HBUINT16 *) c->allocate_size (6 + 2 * k); + if (unlikely (!v)) return false; + v[0] = 0; /* itemCount */ + v[1] = 0; /* wordSizeCount */ + v[2] = k; /* regionIndices.len */ + for (unsigned j = 0; j < k; j++) + v[3 + j] = t.region_indices.arrayZ[j]; + } + + hb_vector_t*> region_ptrs; + if (unlikely (!region_ptrs.alloc_exact (new_regions.length))) return false; + for (const auto &r : new_regions) + region_ptrs.push (&r); + auto *region_list = c->start_embed (); + return region_list->serialize (c, axis_tags, region_ptrs); + } + + private: + hb_vector_t> orig_regions; +}; + +/* Usage-collection pass for partial instancing: record which VarDatas the + * retained charstrings' and private dicts' blends reference. */ +struct cff2_usage_param_t +{ + void init () {} + + cff2_instancing_plan_t *instancing = nullptr; + unsigned ivs = 0; /* dict-side current vsindex */ +}; + +struct cff2_cs_opset_usage_t : cff2_cs_opset_t +{ + static void process_blend (cff2_cs_interp_env_t &env, cff2_usage_param_t& param) + { + param.instancing->note_use (env.get_ivs ()); + SUPER::process_blend (env, param); + } + + private: + typedef cff2_cs_opset_t SUPER; +}; + +struct cff2_private_dict_usage_opset_t : dict_opset_t +{ + static void process_op (op_code_t op, cff2_priv_dict_interp_env_t& env, cff2_usage_param_t& param) + { + switch (op) { + case OpCode_vsindexdict: + env.process_vsindex (); + param.ivs = env.get_ivs (); + env.clear_args (); + return; + case OpCode_blenddict: + param.instancing->note_use (param.ivs); + env.clear_args (); + return; + default: + dict_opset_t::process_op (op, env); + if (!env.argStack.is_empty ()) return; + env.clear_args (); + return; + } + } +}; + +} /* namespace CFF */ + struct cff2_sub_table_info_t : cff_sub_table_info_t { cff2_sub_table_info_t () @@ -130,6 +449,8 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_t &env, flatten_param_t& param) + { + const cff2_instancing_plan_t &instancer = *param.instancer; + unsigned ivs = env.get_ivs (); + const cff2_instancing_plan_t::vardata_transform_t *t = instancer.get_transform (ivs); + if (unlikely (!t)) + { + env.set_error (); + return; + } + + unsigned n = arg.numValues; + for (unsigned int j = 0; j < n; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + if (unlikely (!(arg1.blending () && (arg1.numValues == n) && (arg1.valueIndex == j) && + (arg1.deltas.length == env.get_region_count ()) && + (arg1.deltas.length == t->gains.length)))) + { + env.set_error (); + return; + } + } + + str_encoder_t encoder (param.flatStr); + unsigned k_new = t->matrix.length; + + if (!k_new) + { + /* All of this VarData's regions died; blends dissolve into statics. */ + for (unsigned int j = 0; j < n; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + number_t v; + v.set_real (arg1.to_real () + round (instancer.fold_deltas (ivs, arg1.deltas.as_array ()))); + encoder.encode_num_cs (v); + } + return; + } + + /* Emit in chunks so the output charstring stays within the argument + * stack limit: values already emitted for this op, plus this chunk's + * defaults, deltas and count, must not exceed 513. */ + unsigned done = 0; + while (done < n) + { + unsigned avail = 512 > (i + done) ? 512 - (i + done) : 0; + unsigned chunk = hb_min (avail / (k_new + 1), n - done); + if (unlikely (!chunk)) + { + env.set_error (); + return; + } + + for (unsigned int j = done; j < done + chunk; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + number_t v; + v.set_real (arg1.to_real () + round (instancer.fold_deltas (ivs, arg1.deltas.as_array ()))); + encoder.encode_num_cs (v); + } + for (unsigned int j = done; j < done + chunk; j++) + { + const blend_arg_t &arg1 = env.argStack[i + j]; + for (unsigned r = 0; r < k_new; r++) + { + number_t v; + v.set_int ((int) round (t->transform_delta (r, arg1.deltas.as_array ()))); + encoder.encode_num_cs (v); + } + } + encoder.encode_int (chunk); + encoder.encode_op (OpCode_blendcs); + done += chunk; + } + param.emitted_blend = true; + } + + /* Partial instancing: prepend a vsindex op when the charstring's + * (remapped) ivs differs from its FD's (remapped) private-dict ivs. */ + static void emit_vsindex_prefix (cff2_cs_interp_env_t &env, flatten_param_t& param) + { + if (!param.emitted_blend) return; + const cff2_instancing_plan_t &instancer = *param.instancer; + unsigned new_ivs = instancer.remap_ivs (env.get_ivs ()); + unsigned fd_ivs = instancer.remap_ivs (env.get_orig_ivs ()); + if (new_ivs == fd_ivs) return; + + str_buff_t prefix; + str_encoder_t enc (prefix); + enc.encode_int ((int) new_ivs); + enc.encode_op (OpCode_vsindexcs); + + str_buff_t &buf = param.flatStr; + unsigned old_len = buf.length; + if (unlikely (prefix.in_error () || !buf.resize (old_len + prefix.length))) + { + env.set_error (); + return; + } + memmove (buf.arrayZ + prefix.length, buf.arrayZ, old_len); + hb_memcpy (buf.arrayZ, prefix.arrayZ, prefix.length); + } + static void flush_op (op_code_t op, cff2_cs_interp_env_t &env, flatten_param_t& param) { switch (op) @@ -354,6 +785,10 @@ struct cff2_private_blend_encoder_param_t hb_vector_t scalars; const CFF2ItemVariationStore *varStore = nullptr; hb_array_t normalized_coords; + + /* CFF2 partial instancing: when set, blends are rewritten against the + * instanced variation store instead of being flattened. */ + const cff2_instancing_plan_t *instancer = nullptr; }; struct cff2_private_dict_blend_opset_t : dict_opset_t @@ -366,6 +801,81 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t arg.set_int (round (arg.to_real () + param.blend_deltas (blends))); } + /* Partial instancing: emit the args preceding this blend group, then the + * group itself rewritten against the instanced store, and clear the + * stack. The op's remaining args are flushed at process_op time. */ + static void rewrite_blends (cff2_priv_dict_interp_env_t& env, + cff2_private_blend_encoder_param_t& param, + unsigned start, unsigned n, unsigned k) + { + const cff2_instancing_plan_t &instancer = *param.instancer; + const cff2_instancing_plan_t::vardata_transform_t *t = instancer.get_transform (param.ivs); + if (unlikely (!t || t->gains.length != k)) + { + env.set_error (); + return; + } + + str_buff_t str; + str_encoder_t encoder (str); + + for (unsigned idx = 0; idx < start; idx++) + encoder.encode_num_tp (env.argStack[idx]); + + unsigned k_new = t->matrix.length; + if (!k_new) + { + /* All of this VarData's regions died; blends dissolve into statics. */ + for (unsigned j = 0; j < n; j++) + { + const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); + number_t v; + v.set_real (env.argStack[start + j].to_real () + round (param.blend_deltas (blends))); + encoder.encode_num_tp (v); + } + } + else + { + unsigned done = 0; + while (done < n) + { + unsigned avail = 512 > (start + done) ? 512 - (start + done) : 0; + unsigned chunk = hb_min (avail / (k_new + 1), n - done); + if (unlikely (!chunk)) + { + env.set_error (); + return; + } + + for (unsigned j = done; j < done + chunk; j++) + { + const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); + number_t v; + v.set_real (env.argStack[start + j].to_real () + round (param.blend_deltas (blends))); + encoder.encode_num_tp (v); + } + for (unsigned j = done; j < done + chunk; j++) + { + const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); + for (unsigned r = 0; r < k_new; r++) + { + number_t v; + v.set_int ((int) round (t->transform_delta (r, blends))); + encoder.encode_num_tp (v); + } + } + encoder.encode_int (chunk); + encoder.encode_op (OpCode_blenddict); + done += chunk; + } + } + + auto bytes = str.as_bytes (); + param.c->embed (&bytes, bytes.length); + + env.clear_args (); + } + static void process_blend (cff2_priv_dict_interp_env_t& env, cff2_private_blend_encoder_param_t& param) { unsigned int n, k; @@ -381,6 +891,13 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t env.set_error (); return; } + + if (param.instancer) + { + rewrite_blends (env, param, start, n, k); + return; + } + for (unsigned int i = 0; i < n; i++) { const hb_array_t blends = env.argStack.sub_array (start + n + (i * k), k); @@ -411,6 +928,20 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t case OpCode_vsindexdict: env.process_vsindex (); param.ivs = env.get_ivs (); + if (param.instancer) + { + /* Re-emit with the remapped vsindex; 0 is the dict default. */ + unsigned new_ivs = param.instancer->remap_ivs (param.ivs); + if (new_ivs) + { + str_buff_t str; + str_encoder_t encoder (str); + encoder.encode_int ((int) new_ivs); + encoder.encode_op (OpCode_vsindexdict); + auto bytes = str.as_bytes (); + param.c->embed (&bytes, bytes.length); + } + } env.clear_args (); return; case OpCode_blenddict: @@ -447,9 +978,11 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t { cff2_private_dict_op_serializer_t (bool desubroutinize_, bool drop_hints_, bool pinned_, const CFF::CFF2ItemVariationStore* varStore_, - hb_array_t normalized_coords_) + hb_array_t normalized_coords_, + const cff2_instancing_plan_t *instancer_ = nullptr) : desubroutinize (desubroutinize_), drop_hints (drop_hints_), pinned (pinned_), - param (nullptr, varStore_, normalized_coords_) {} + param (nullptr, varStore_, normalized_coords_) + { param.instancer = instancer_; } bool serialize (hb_serialize_context_t *c, const op_str_t &opstr, @@ -468,11 +1001,11 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t return_trace (FontDict::serialize_link2_op (c, opstr.op, subrs_link)); } - if (pinned) + if (pinned || param.instancer) { /* Reinterpret opstr and process blends. The param persists across * this dict's opstrs, so that an ivs set by a vsindexdict opstr is - * still in effect when a later opstr's blends are flattened. */ + * still in effect when a later opstr's blends are processed. */ cff2_priv_dict_interp_env_t env {hb_ubytes_t (opstr.ptr, opstr.length)}; param.c = c; dict_interpreter_t interp (env); @@ -490,176 +1023,6 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t }; -/* - * Partial instancing (some axes pinned or limited, others kept). - * - * This is a port of fontTools' instantiateCFF2 (fonttools/fonttools#3506), - * with one simplification: the variation-store instancing solver acts on - * regions independently of the per-blend delta values, so instead of lifting - * every blend's deltas into the store, instancing it, and reading the rows - * back, we instance each VarData once with identity delta rows. The - * instantiated tuples then give, per VarData, a fixed linear map from old - * per-region deltas to new per-region deltas. The contribution that folds - * into each blend's default value is the old store's region scalars - * evaluated at the new default location (plan->normalized_coords); the - * surviving rebased regions all evaluate to zero there. - */ -struct cff2_instancing_plan_t -{ - struct vardata_transform_t - { - /* new_deltas[j] = Σ_i matrix[j][i] * old_deltas[i] */ - hb_vector_t> matrix; - /* Default-value fold-in scalars, one per old region: the old store's - * region scalars at the new default location. */ - hb_vector_t gains; - /* Index into the new global region list, per new region. */ - hb_vector_t region_indices; - unsigned new_major = 0; - bool alive () const { return matrix.length; } - }; - - hb_vector_t transforms; /* per old VarData (vsindex) */ - hb_vector_t> new_regions; /* global region list */ - unsigned new_major_count = 0; - - bool has_variations () const { return new_major_count; } - - const vardata_transform_t *get_transform (unsigned major) const - { return major < transforms.length ? &transforms.arrayZ[major] : nullptr; } - - /* The new vsindex a private dict's (or charstring's) old ivs maps to; - * dead VarDatas fall back to 0, their blends having become static. */ - unsigned remap_ivs (unsigned old_ivs) const - { - const vardata_transform_t *t = get_transform (old_ivs); - return (t && t->alive ()) ? t->new_major : 0; - } - - double fold_deltas (unsigned old_ivs, hb_array_t deltas) const - { - const vardata_transform_t *t = get_transform (old_ivs); - if (unlikely (!t || t->gains.length != deltas.length)) return 0.; - double v = 0.; - for (unsigned i = 0; i < deltas.length; i++) - v += (double) t->gains.arrayZ[i] * deltas.arrayZ[i].to_real (); - return v; - } - - bool create (const CFF2ItemVariationStore *cff2VarStore, - const hb_subset_plan_t *plan) - { - const OT::ItemVariationStore &varStore = cff2VarStore->varStore; - unsigned major_count = varStore.get_sub_table_count (); - if (!transforms.resize (major_count)) return false; - - hb_vector_t> orig_regions; - if (!varStore.get_region_list ().get_var_regions (plan->axes_old_index_tag_map, orig_regions)) - return false; - - /* Instance each VarData with identity delta rows; the surviving tuples' - * delta columns are the old-region → new-region transform. */ - hb_vector_t tuple_vars_list; - if (!tuple_vars_list.resize (major_count)) return false; - OT::optimize_scratch_t scratch; - for (unsigned m = 0; m < major_count; m++) - { - const OT::VarData &var_data = varStore.get_sub_table (m); - unsigned k = var_data.get_region_index_count (); - vardata_transform_t &t = transforms.arrayZ[m]; - - if (!t.gains.resize_exact (k)) return false; - varStore.get_region_scalars (m, plan->normalized_coords.arrayZ, - plan->normalized_coords.length, - t.gains.arrayZ, k); - - OT::tuple_variations_t &tuples = tuple_vars_list.arrayZ[m]; - for (unsigned r = 0; r < k; r++) - { - OT::tuple_delta_t tuple; - if (!tuple.deltas_x.resize (k) || - !tuple.indices.resize (k)) - return false; - for (unsigned i = 0; i < k; i++) - tuple.indices.arrayZ[i] = true; - tuple.deltas_x.arrayZ[r] = 1.f; - unsigned region_index = var_data.get_region_index (r); - if (unlikely (region_index >= orig_regions.length)) return false; - tuple.axis_tuples = orig_regions.arrayZ[region_index]; - if (unlikely (tuple.axis_tuples.in_error ())) return false; - tuples.tuple_vars.push (std::move (tuple)); - } - if (unlikely (tuples.tuple_vars.in_error ())) return false; - - if (!tuples.instantiate (plan->axes_location, plan->axes_triple_distances, scratch)) - return false; - } - - /* Build the new global region list: surviving original regions first, - * in their original order, then solver-split new regions in order of - * appearance (fontTools' rebuildRegions). Keys hash by content, so - * pointers into different owners compare fine. */ - hb_hashmap_t*, unsigned> region_idx_map; - hb_vector_t*> region_ptrs; - for (const auto &tuples : tuple_vars_list) - for (const auto &tuple : tuples.tuple_vars) - if (!region_idx_map.has (&tuple.axis_tuples)) - if (unlikely (!region_idx_map.set (&tuple.axis_tuples, (unsigned) -1))) - return false; - for (const auto &r : orig_regions) - { - unsigned *idx; - if (region_idx_map.has (&r, &idx) && *idx == (unsigned) -1) - { - if (unlikely (!region_idx_map.set (&r, region_ptrs.length))) return false; - region_ptrs.push (&r); - } - } - for (const auto &tuples : tuple_vars_list) - for (const auto &tuple : tuples.tuple_vars) - { - unsigned *idx; - if (region_idx_map.has (&tuple.axis_tuples, &idx) && *idx == (unsigned) -1) - { - if (unlikely (!region_idx_map.set (&tuple.axis_tuples, region_ptrs.length))) return false; - region_ptrs.push (&tuple.axis_tuples); - } - } - if (unlikely (region_ptrs.in_error ())) return false; - - /* Fill in per-VarData transforms and assign new vsindexes. */ - for (unsigned m = 0; m < major_count; m++) - { - vardata_transform_t &t = transforms.arrayZ[m]; - const auto &tuples = tuple_vars_list.arrayZ[m]; - unsigned k = t.gains.length; - for (const auto &tuple : tuples.tuple_vars) - { - if (unlikely (tuple.deltas_x.length != k)) return false; - unsigned *idx; - if (unlikely (!region_idx_map.has (&tuple.axis_tuples, &idx))) return false; - t.region_indices.push (*idx); - hb_vector_t col; - if (unlikely (!col.resize_exact (k))) return false; - for (unsigned i = 0; i < k; i++) - col.arrayZ[i] = tuple.deltas_x.arrayZ[i]; - t.matrix.push (std::move (col)); - } - if (unlikely (t.matrix.in_error () || t.region_indices.in_error ())) return false; - if (t.alive ()) - t.new_major = new_major_count++; - } - - if (!new_regions.resize (region_ptrs.length)) return false; - for (unsigned i = 0; i < region_ptrs.length; i++) - { - new_regions.arrayZ[i] = *region_ptrs.arrayZ[i]; - if (unlikely (new_regions.arrayZ[i].in_error ())) return false; - } - - return true; - } -}; namespace OT { struct cff2_subset_plan @@ -675,20 +1038,22 @@ struct cff2_subset_plan orig_fdcount = acc.fdArray->count; drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING; - pinned = (bool) plan->normalized_coords; + pinned = plan->all_axes_pinned; + bool instancing_requested = (bool) plan->normalized_coords; normalized_coords = plan->normalized_coords; head_maxp_info = plan->head_maxp_info; hmtx_map = &plan->hmtx_map; desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE || - pinned; // For instancing we need this path + instancing_requested; // For instancing we need this path /* Partial instancing: some axes pinned or limited, others kept. */ - partial_instancing = plan->normalized_coords && !plan->all_axes_pinned && + partial_instancing = instancing_requested && !pinned && acc.varStore != &Null (CFF2ItemVariationStore) && acc.varStore->varStore.get_sub_table_count (); if (partial_instancing && unlikely (!instancing.create (acc.varStore, plan))) return false; + axis_tags = &plan->axis_tags; /* Enable command capture for CFF2→CFF1 conversion (for specialization) */ capture_commands = pinned; @@ -701,6 +1066,74 @@ struct cff2_subset_plan if (desubroutinize) { + if (partial_instancing) + { + /* Pass 1: collect which VarDatas the retained blends reference, so + * unused ones get pruned and the survivors renumbered. */ + hb_set_t used_fds; + for (unsigned int i = 0; i < num_glyphs; i++) + { + hb_codepoint_t glyph; + if (!plan->old_gid_for_new_gid (i, &glyph)) + continue; + const hb_ubytes_t str = (*acc.charStrings)[glyph]; + unsigned int fd = acc.fdSelect->get_fd (glyph); + if (unlikely (fd >= acc.fdCount)) + return false; + used_fds.add (fd); + + cff2_cs_interp_env_t env (str, acc, fd); + cs_interpreter_t, cff2_cs_opset_usage_t, cff2_usage_param_t> interp (env); + cff2_usage_param_t param; + param.instancing = &instancing; + if (unlikely (!interp.interpret (param))) + return false; + } + for (unsigned fd : used_fds) + { + cff2_usage_param_t param; + param.instancing = &instancing; + unsigned count = acc.privateDicts[fd].get_count (); + for (unsigned j = 0; j < count; j++) + { + const op_str_t &opstr = acc.privateDicts[fd][j]; + cff2_priv_dict_interp_env_t env {hb_ubytes_t (opstr.ptr, opstr.length)}; + dict_interpreter_t interp (env); + if (unlikely (!interp.interpret (param))) + return false; + } + } + if (unlikely (!instancing.finalize ())) + return false; + + /* Pass 2: like subr_flattener_t, but blends stay symbolic (no coords + * fed to the env) and get rewritten against the instanced store. */ + if (!subset_charstrings.resize_exact (num_glyphs)) + return false; + for (unsigned int i = 0; i < num_glyphs; i++) + { + hb_codepoint_t glyph; + if (!plan->old_gid_for_new_gid (i, &glyph)) + continue; + const hb_ubytes_t str = (*acc.charStrings)[glyph]; + unsigned int fd = acc.fdSelect->get_fd (glyph); + if (unlikely (fd >= acc.fdCount)) + return false; + + cff2_cs_interp_env_t env (str, acc, fd); + cs_interpreter_t, cff2_cs_opset_flatten_t, flatten_param_t> interp (env); + flatten_param_t param = { + subset_charstrings.arrayZ[i], + (bool) (plan->flags & HB_SUBSET_FLAGS_NO_HINTING), + plan + }; + param.instancer = &instancing; + if (unlikely (!interp.interpret (param))) + return false; + } + } + else + { /* Flatten global & local subrs */ subr_flattener_t, cff2_cs_opset_flatten_t> flattener(acc, plan); @@ -719,6 +1152,7 @@ struct cff2_subset_plan if (!flattener.flatten (subset_charstrings)) return false; } + } } else { @@ -786,6 +1220,7 @@ struct cff2_subset_plan bool partial_instancing = false; cff2_instancing_plan_t instancing; + const hb_vector_t *axis_tags = nullptr; unsigned min_charstrings_off_size = 0; @@ -1322,7 +1757,8 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c, } auto *pd = c->push (); cff2_private_dict_op_serializer_t privSzr (plan.desubroutinize, plan.drop_hints, plan.pinned, - varStore, normalized_coords); + varStore, normalized_coords, + plan.partial_instancing ? &plan.instancing : nullptr); if (likely (pd->serialize (c, privateDicts[i], privSzr, subrs_link))) { unsigned fd = plan.fdmap[i]; @@ -1375,13 +1811,30 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c, if (varStore != &Null (CFF2ItemVariationStore) && !plan.pinned) { - auto *dest = c->push (); - if (unlikely (!dest->serialize (c, varStore))) + if (plan.partial_instancing) { - c->pop_discard (); - return false; + if (plan.instancing.has_variations ()) + { + c->push (); + if (unlikely (!plan.instancing.serialize_var_store (c, *plan.axis_tags))) + { + c->pop_discard (); + return false; + } + plan.info.var_store_link = c->pop_pack (false); + } + /* else: the store emptied; the vstore op gets dropped along with it. */ + } + else + { + auto *dest = c->push (); + if (unlikely (!dest->serialize (c, varStore))) + { + c->pop_discard (); + return false; + } + plan.info.var_store_link = c->pop_pack (false); } - plan.info.var_store_link = c->pop_pack (false); } OT::cff2 *cff2 = c->allocate_min (); From 17f7701f9c968bb4e81f4d6f60aa70c41af46e1c Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 21:38:38 -0600 Subject: [PATCH 039/112] [subset] Update axis-pinning docs: partial instancing is supported Partial instancing has long worked for glyf fonts, and now works for CFF2 too; drop the outdated all-axes-must-be-pinned claim. --- src/hb-subset-input.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 12d3c36e3..8fc09bd9a 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -426,8 +426,7 @@ hb_subset_input_keep_everything (hb_subset_input_t *input) * * Pin all axes to default locations in the given subset input object. * - * All axes in a font must be pinned. Additionally, `CFF2` table, if present, - * will be de-subroutinized. + * The `CFF2` table, if present, will be de-subroutinized. * * Return value: `true` if success, `false` otherwise * @@ -467,8 +466,7 @@ hb_subset_input_pin_all_axes_to_default (hb_subset_input_t *input, * * Pin an axis to its default location in the given subset input object. * - * All axes in a font must be pinned. Additionally, `CFF2` table, if present, - * will be de-subroutinized. + * The `CFF2` table, if present, will be de-subroutinized. * * Return value: `true` if success, `false` otherwise * @@ -496,8 +494,7 @@ hb_subset_input_pin_axis_to_default (hb_subset_input_t *input, * * Pin an axis to a fixed location in the given subset input object. * - * All axes in a font must be pinned. Additionally, `CFF2` table, if present, - * will be de-subroutinized. + * The `CFF2` table, if present, will be de-subroutinized. * * Return value: `true` if success, `false` otherwise * From f24bb86c95749822b17a08db184755e4c727165a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 21:39:55 -0600 Subject: [PATCH 040/112] [test/subset] Add CFF2 partial-instancing tests Range limiting, pin-one-keep-one, a moved default, and axis dropping, on AdobeVFPrototype. Expected outputs are hb-subset's own (fontTools TTX comparison does not apply to CFF2 charstring encodings); they were verified geometrically against both the original font and fontTools varLib.instancer output at a grid of locations in the kept ranges. --- ...VFPrototype.default.41,42,43.CNTR=drop.otf | Bin 0 -> 3548 bytes ...t.41,42,43.wght=300-500-700,CNTR=25-75.otf | Bin 0 -> 4360 bytes ...rototype.default.41,42,43.wght=300-600.otf | Bin 0 -> 4080 bytes ...e.default.41,42,43.wght=500,CNTR=0-100.otf | Bin 0 -> 2384 bytes ...AdobeVFPrototype.default.all.CNTR=drop.otf | Bin 0 -> 96984 bytes ...efault.all.wght=300-500-700,CNTR=25-75.otf | Bin 0 -> 174384 bytes ...beVFPrototype.default.all.wght=300-600.otf | Bin 0 -> 142044 bytes ...totype.default.all.wght=500,CNTR=0-100.otf | Bin 0 -> 66448 bytes .../data/tests/instantiate_cff2_partial.tests | 18 ++++++++++++++++++ test/subset/meson.build | 1 + 10 files changed, 19 insertions(+) create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.CNTR=drop.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=300-500-700,CNTR=25-75.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=300-600.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=500,CNTR=0-100.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.CNTR=drop.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=300-500-700,CNTR=25-75.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=300-600.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=500,CNTR=0-100.otf create mode 100644 test/subset/data/tests/instantiate_cff2_partial.tests diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.CNTR=drop.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.CNTR=drop.otf new file mode 100644 index 0000000000000000000000000000000000000000..13f87196ce85338bab794c0b46536969bc15963b GIT binary patch literal 3548 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 A#sB~S literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=300-600.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=300-600.otf new file mode 100644 index 0000000000000000000000000000000000000000..f1af6023e8908b774554ae3e779d9ca1da4f8100 GIT binary patch literal 4080 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 HP>=ow4P{me literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.CNTR=drop.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.CNTR=drop.otf new file mode 100644 index 0000000000000000000000000000000000000000..389f127587748ac2c2cf9e08745fea4825371ab6 GIT binary patch literal 96984 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�g%;J!YMrQ=1>iXV9(Mj+CoZ3} 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=300-500-700,CNTR=25-75.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=300-500-700,CNTR=25-75.otf new file mode 100644 index 0000000000000000000000000000000000000000..c98fc90c1317378d2fc234130c159e550d7a1805 GIT binary patch literal 174384 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� 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 Date: Fri, 3 Jul 2026 22:52:44 -0600 Subject: [PATCH 041/112] [cff] Saturate number_t::to_fixed value * 65536.0 overflowed int32 (undefined behavior) for magnitudes of 32768 or more; such values now clamp to the nearest representable 16.16 fixed operand. Reachable from CFF2 partial instancing, where region rebasing can scale valid deltas past the representable range, and latent in the pre-existing flatten paths. --- src/hb-cff-interp-common.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hb-cff-interp-common.hh b/src/hb-cff-interp-common.hh index c9829a4db..9ca8bf56d 100644 --- a/src/hb-cff-interp-common.hh +++ b/src/hb-cff-interp-common.hh @@ -238,7 +238,8 @@ struct number_t } void set_fixed (int32_t v) { value = v / 65536.0; } - int32_t to_fixed () const { return value * 65536.0; } + int32_t to_fixed () const + { return (int32_t) hb_clamp (value * 65536.0, (double) INT32_MIN, (double) INT32_MAX); } void set_real (double v) { value = v; } double to_real () const { return value; } From ac93f85125c1a4511507a8014bb3e7314be148bc Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 22:52:44 -0600 Subject: [PATCH 042/112] [cff2] Accumulate deltas when a blend result feeds a later blend Chained blends (a blend result used as an operand of a later blend in the same charstring) are spec-legal and HB renders them correctly, but the symbolic (no-coords) interpretation overwrote the inner deltas via set_blends, silently corrupting desubroutinize and partial-instancing output. fontTools refuses such input; accumulating is exact. --- src/hb-cff2-interp-cs.hh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/hb-cff2-interp-cs.hh b/src/hb-cff2-interp-cs.hh index 241524215..770a4ae36 100644 --- a/src/hb-cff2-interp-cs.hh +++ b/src/hb-cff2-interp-cs.hh @@ -264,6 +264,19 @@ struct cff2_cs_opset_t : cs_opset_t, PAR { if (env.have_coords ()) arg.set_int (round (arg.to_real () + env.blend_deltas (blends))); + else if (unlikely (arg.blending ())) + { + /* A blend result used as an operand of a later blend: the value is + * default + inner deltas + outer deltas, so accumulate the deltas. */ + hb_vector_t inner = std::move (arg.deltas); + arg.set_blends (n, i, blends); + if (likely (inner.length == arg.deltas.length)) + for (unsigned j = 0; j < inner.length; j++) + arg.deltas.arrayZ[j].set_real (arg.deltas.arrayZ[j].to_real () + + inner.arrayZ[j].to_real ()); + else + env.set_error (); + } else arg.set_blends (n, i, blends); } From 33738aeda9fb4efc14f4ffc6aac84f994414e3ae Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 22:53:03 -0600 Subject: [PATCH 043/112] [subset/cff2] Harden partial instancing per review - Dissolve private-dict blends of VarDatas unused by any retained charstring: under retain-gids, fdmap keeps FDs of hole glyphs the usage pass never scanned, and their dicts were rewritten against a dead transform. - Take the partial path even when the store has regions but no VarData subtables; the verbatim-copy fallback emitted a region list whose axisCount contradicted the subsetted fvar (OTS-rejected). - Make the usage pass honor drop-hints, so VarDatas referenced only by hint blends don't survive as bloat. - Require an actual instancing request for the pinned path: a face without fvar plus a reused subset input made all_axes_pinned spuriously true. - Error-compensate the fold rounding across private-dict operators: most blended dict values are delta-encoded, so independently rounded folds accumulated in the decoded absolutes (blue zones drifted by ~0.5 per element); now every absolute is within 0.5 of exact. - Clarify HB_SUBSET_FLAGS_DOWNGRADE_CFF2 doc: it applies to fully pinned instancing. Expected test outputs regenerated for the private-dict rounding change. --- src/hb-subset-cff2.cc | 83 ++++++++++++++---- src/hb-subset.h | 6 +- ...t.41,42,43.wght=300-500-700,CNTR=25-75.otf | Bin 4360 -> 4360 bytes ...e.default.41,42,43.wght=500,CNTR=0-100.otf | Bin 2384 -> 2384 bytes ...efault.all.wght=300-500-700,CNTR=25-75.otf | Bin 174384 -> 174384 bytes ...totype.default.all.wght=500,CNTR=0-100.otf | Bin 66448 -> 66448 bytes ...ype_vsindex.default.41,42,43.CNTR=drop.otf | Bin 0 -> 3136 bytes ...t.41,42,43.wght=300-500-700,CNTR=25-75.otf | Bin 0 -> 3856 bytes ..._vsindex.default.41,42,43.wght=300-600.otf | Bin 0 -> 3548 bytes ...x.default.41,42,43.wght=500,CNTR=0-100.otf | Bin 0 -> 2212 bytes ...rototype_vsindex.default.all.CNTR=drop.otf | Bin 0 -> 3136 bytes ...efault.all.wght=300-500-700,CNTR=25-75.otf | Bin 0 -> 3856 bytes ...otype_vsindex.default.all.wght=300-600.otf | Bin 0 -> 3548 bytes ...sindex.default.all.wght=500,CNTR=0-100.otf | Bin 0 -> 2212 bytes 14 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.CNTR=drop.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=300-500-700,CNTR=25-75.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=300-600.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=500,CNTR=0-100.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.CNTR=drop.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=300-500-700,CNTR=25-75.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=300-600.otf create mode 100644 test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=500,CNTR=0-100.otf diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index 8ca190ee0..a4e5060f5 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -312,25 +312,53 @@ struct cff2_instancing_plan_t }; /* Usage-collection pass for partial instancing: record which VarDatas the - * retained charstrings' and private dicts' blends reference. */ + * retained charstrings' and private dicts' blends reference. Mirrors the + * emission pass: blends consumed by dropped hint ops don't count. */ struct cff2_usage_param_t { void init () {} cff2_instancing_plan_t *instancing = nullptr; + bool drop_hints = false; unsigned ivs = 0; /* dict-side current vsindex */ }; struct cff2_cs_opset_usage_t : cff2_cs_opset_t { - static void process_blend (cff2_cs_interp_env_t &env, cff2_usage_param_t& param) + static void flush_args_and_op (op_code_t op, cff2_cs_interp_env_t &env, cff2_usage_param_t& param) { - param.instancing->note_use (env.get_ivs ()); - SUPER::process_blend (env, param); - } + bool counts = true; + switch (op) + { + case OpCode_return: + case OpCode_endchar: + counts = false; + break; - private: - typedef cff2_cs_opset_t SUPER; + case OpCode_hstem: + case OpCode_hstemhm: + case OpCode_vstem: + case OpCode_vstemhm: + case OpCode_hintmask: + case OpCode_cntrmask: + if (param.drop_hints) + counts = false; + break; + + default: + break; + } + + if (counts) + for (unsigned int i = 0; i < env.argStack.get_count (); i++) + if (env.argStack[i].blending ()) + { + param.instancing->note_use (env.get_ivs ()); + break; + } + + env.clear_args (); + } }; struct cff2_private_dict_usage_opset_t : dict_opset_t @@ -555,7 +583,7 @@ struct cff2_cs_opset_flatten_t : cff2_cs_opset_tmatrix.length; + unsigned k_new = t->alive () ? t->matrix.length : 0; if (!k_new) { @@ -789,6 +817,9 @@ struct cff2_private_blend_encoder_param_t /* CFF2 partial instancing: when set, blends are rewritten against the * instanced variation store instead of being flattened. */ const cff2_instancing_plan_t *instancer = nullptr; + /* Error-compensated fold rounding state, per dict operator. */ + double fold_exact = 0.; + double fold_emitted = 0.; }; struct cff2_private_dict_blend_opset_t : dict_opset_t @@ -801,6 +832,21 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t arg.set_int (round (arg.to_real () + param.blend_deltas (blends))); } + /* The fold added to a value, error-compensated across the operator: most + * blended private-dict values (BlueValues, StemSnap*, ...) are + * delta-encoded, so independently rounded folds would accumulate in the + * decoded absolutes; keeping the emitted cumulative fold equal to the + * rounded exact cumulative fold bounds every absolute within ±0.5. */ + static double fold (cff2_private_blend_encoder_param_t& param, + const hb_array_t blends) + { + double f = param.blend_deltas (blends); + double emit = round (param.fold_exact + f) - param.fold_emitted; + param.fold_exact += f; + param.fold_emitted += emit; + return emit; + } + /* Partial instancing: emit the args preceding this blend group, then the * group itself rewritten against the instanced store, and clear the * stack. The op's remaining args are flushed at process_op time. */ @@ -822,15 +868,17 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t for (unsigned idx = 0; idx < start; idx++) encoder.encode_num_tp (env.argStack[idx]); - unsigned k_new = t->matrix.length; + unsigned k_new = t->alive () ? t->matrix.length : 0; if (!k_new) { - /* All of this VarData's regions died; blends dissolve into statics. */ + /* This VarData died (or is unused by any retained charstring, which + * can happen for FDs kept only for retain-gids holes); blends + * dissolve into statics. */ for (unsigned j = 0; j < n; j++) { const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); number_t v; - v.set_real (env.argStack[start + j].to_real () + round (param.blend_deltas (blends))); + v.set_real (env.argStack[start + j].to_real () + fold (param, blends)); encoder.encode_num_tp (v); } } @@ -851,7 +899,7 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t { const hb_array_t blends = env.argStack.sub_array (start + n + (j * k), k); number_t v; - v.set_real (env.argStack[start + j].to_real () + round (param.blend_deltas (blends))); + v.set_real (env.argStack[start + j].to_real () + fold (param, blends)); encoder.encode_num_tp (v); } for (unsigned j = done; j < done + chunk; j++) @@ -892,7 +940,7 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t return; } - if (param.instancer) + if (param.instancer && k) { rewrite_blends (env, param, start, n, k); return; @@ -971,6 +1019,7 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t param.c->embed (&bytes, bytes.length); env.clear_args (); + param.fold_exact = param.fold_emitted = 0.; } }; @@ -1038,8 +1087,8 @@ struct cff2_subset_plan orig_fdcount = acc.fdArray->count; drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING; - pinned = plan->all_axes_pinned; bool instancing_requested = (bool) plan->normalized_coords; + pinned = instancing_requested && plan->all_axes_pinned; normalized_coords = plan->normalized_coords; head_maxp_info = plan->head_maxp_info; hmtx_map = &plan->hmtx_map; @@ -1048,8 +1097,7 @@ struct cff2_subset_plan /* Partial instancing: some axes pinned or limited, others kept. */ partial_instancing = instancing_requested && !pinned && - acc.varStore != &Null (CFF2ItemVariationStore) && - acc.varStore->varStore.get_sub_table_count (); + acc.varStore != &Null (CFF2ItemVariationStore); if (partial_instancing && unlikely (!instancing.create (acc.varStore, plan))) return false; @@ -1086,6 +1134,7 @@ struct cff2_subset_plan cs_interpreter_t, cff2_cs_opset_usage_t, cff2_usage_param_t> interp (env); cff2_usage_param_t param; param.instancing = &instancing; + param.drop_hints = drop_hints; if (unlikely (!interp.interpret (param))) return false; } @@ -1097,6 +1146,8 @@ struct cff2_subset_plan for (unsigned j = 0; j < count; j++) { const op_str_t &opstr = acc.privateDicts[fd][j]; + if (drop_hints && dict_opset_t::is_hint_op (opstr.op)) + continue; cff2_priv_dict_interp_env_t env {hb_ubytes_t (opstr.ptr, opstr.length)}; dict_interpreter_t interp (env); if (unlikely (!interp.interpret (param))) diff --git a/src/hb-subset.h b/src/hb-subset.h index 49cd12763..a13349ac8 100644 --- a/src/hb-subset.h +++ b/src/hb-subset.h @@ -84,9 +84,9 @@ typedef struct hb_subset_plan_t hb_subset_plan_t; * HB_SUBSET_FLAGS_RETAIN_GIDS then the number of glyphs in the font won't * be reduced as a result of subsetting. If necessary empty glyphs will be * included at the end of the font to keep the number of glyphs unchanged. - * @HB_SUBSET_FLAGS_DOWNGRADE_CFF2: If set and instantiating a variable font, - * convert the output CFF2 table to CFF1. This enables compatibility with older - * renderers that don't support CFF2. Since: 13.0.0 + * @HB_SUBSET_FLAGS_DOWNGRADE_CFF2: If set and instantiating a variable font + * with all axes pinned, convert the output CFF2 table to CFF1. This enables + * compatibility with older renderers that don't support CFF2. Since: 13.0.0 * * List of boolean properties that can be configured on the subset input. * diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=300-500-700,CNTR=25-75.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.41,42,43.wght=300-500-700,CNTR=25-75.otf index ddb35e12a866b097b645ffc1472d6fddaec265de..d59b75d520f4154712b59946ee4c7a0941e0423a 100644 GIT binary patch delta 49 zcmeBB>QEB)4+-&S5M*RvU||q&c5^d2<5#v(_$MQCf%eSJ{7m_5Y%|u)m@@Ou<`#|? F4gfQEB)4+-&S5M*RvU||q&c5^d2>sP)}_$MQCp7!+3{7m_5Y%|x+oHFz7<`#|? F4gfj5DI2AHmxl$qSK H5(Yj4fE^IQ delta 49 zcmV-10M7r=63`M8PgGP-01g0v00RJELqu;6V(9&nAEAW>j5DI2AQpyl$qVL H5(Yj4fEN(K diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=300-500-700,CNTR=25-75.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype.default.all.wght=300-500-700,CNTR=25-75.otf index c98fc90c1317378d2fc234130c159e550d7a1805..9d5412577a4cb7269db812d8813ab75ac05ff292 100644 GIT binary patch delta 59 zcmV-B0L1^W(h9KB3KLIMR8IgA0RR9501!h)Mlx3F8L<+d9#lJjY9^Qu9%dW J+_NG@ZoaS46E^?= delta 51 zcmV-30L=f8hXjy^1QSnGR8Ig80Du4k0B}P_Ml$}lu(1<)0Ry*)ce9THjY9^Rt(laW J-LoP^ZoaR}6E^?= diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.CNTR=drop.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.CNTR=drop.otf new file mode 100644 index 0000000000000000000000000000000000000000..4db7879bc5e70677174885cb0c0943e277927563 GIT binary patch literal 3136 zcmds3du&rx82`@gW3RGZaWch;l}rTWWyOK`Vr)zWq&g-;g|WiMidZ_zW!+0)qw8e1 z?MkwfFv3t(-@6W5`091>9EE6JGWOid<6dX-kfv3@Atia z=R0S&GnbZ{DU-I7hAIk+i%oaGTvSG+xrmW?WO+f!p@+)$6A5`lwDd9PKV%I}AYz|G zFE%fmX?n(27l&PfUa_pSp!EGGzkUF*v!TChskJyJ+VUFU{|NL+Yi*VqGEg`48tAjv z!Tv(;86Dz3=JD1lOJ&xg=gqLACgocJ=Wyd`H7!JZ7EiJ)qW8@|WmD3{1M|Uz6F2bm-+=M9Jabj6Kr^cAftzu(%MFIDm<0_V+@WH+2 zxPl2RO<`M(EWlO26uuYw4H$40)A5}u12_kDbp0(5Rv7a5^5u1W&b<*6(L8Whc7$2P z7>|+6lcdjC^E1|5d8S61&;1x<>AB?O`K)7`!owRw1EFB(%TO?UB;s}N^tXj%U$=DO(V2yZ0 z{qWpNrhaFj-Ye?N{Z0V!xtC4Wh^rUCu%tM~;bM)9av6q8zf*BZCW+5|#~QQ;z2XhS zr=#)s=~(<^)mi6~*A_-P#1!*W{mloPxlOuc3eP0Dkzz-hLhJg)E=U%U< zj|t(>z7`pkox6On-_aCm>*DI#NS#MaIThFr_qXczz!a?*z97lbRq+df`ZJBYoXrcv zmM6a2CF;&EjS}p!hD&oifi8(}YrxEbrpt4Joh^L;evI0;cO0w)qv)V32wUTuoh_U8 zz!K}*fzId~R|VP+G(eB8kJX=qc^|(Uc>U^_BS2f`)WFOcZ3492OLK#_qR1}k=tMF zY2O+WZ#}VQ2io#j&;HotH(YM7E985=L)4vEw-3#0i{38Ftv%@V>kk)oJ=xaMx%;J_ zuI^1Xzj$-3EH*JVHMTNV5zUQFik6@KsORuWe=xAVbFg`ZdyVTr#}U_7?@QafJA;AN z4qmB4$+jEWmcCkx?2g#v4|@XJy0(=EnmwpFSm_3nl_iTCN`hf;PuD)5yE%wT{O@!e z%jCa4T72=yB^*&@M)QQNsw_~ZP@~EkDiJ2AvUZe@jvVY271z@&)|8a-q0qBhRo0M! zJ*&!E64}$LtfOpJtjc=I$5&P1gRgNq)2nhSO`~(FoHoLTrQsFLiohN@^e72{t72Q*0;^;83NIxV2*$UVs3SY-H>}(0DRikGTjYwCovXJT! z;XqGDqW%pl#6C8vo}00jf!#4+&?+{c06FAHICtL$hJGA?F5U<6i54KBx5Eq}aLNJ$Ua$=Ft@js0gQN zM)cKtbR};dQH00^w2=PmjEvZw1-o01c@6kffpxLMUxM_{d&#?7L-k5T@(hi*|D16? z{6`oX(U*GkOhQH*RwF%%p772%5YK0eVylE@vT_$B;PYrEUZ?WTfXAPIBQump8*Ee1 GEBXU`9Oi`p literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=300-500-700,CNTR=25-75.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=300-500-700,CNTR=25-75.otf new file mode 100644 index 0000000000000000000000000000000000000000..b7b353ae1ea3a25d5748c148c62041384c1fe445 GIT binary patch literal 3856 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=300-600.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.41,42,43.wght=300-600.otf new file mode 100644 index 0000000000000000000000000000000000000000..4e7f4d1b957a1288d0a91841d20480d3713ce1b8 GIT binary patch literal 3548 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.CNTR=drop.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.CNTR=drop.otf new file mode 100644 index 0000000000000000000000000000000000000000..4db7879bc5e70677174885cb0c0943e277927563 GIT binary patch literal 3136 zcmds3du&rx82`@gW3RGZaWch;l}rTWWyOK`Vr)zWq&g-;g|WiMidZ_zW!+0)qw8e1 z?MkwfFv3t(-@6W5`091>9EE6JGWOid<6dX-kfv3@Atia z=R0S&GnbZ{DU-I7hAIk+i%oaGTvSG+xrmW?WO+f!p@+)$6A5`lwDd9PKV%I}AYz|G zFE%fmX?n(27l&PfUa_pSp!EGGzkUF*v!TChskJyJ+VUFU{|NL+Yi*VqGEg`48tAjv z!Tv(;86Dz3=JD1lOJ&xg=gqLACgocJ=Wyd`H7!JZ7EiJ)qW8@|WmD3{1M|Uz6F2bm-+=M9Jabj6Kr^cAftzu(%MFIDm<0_V+@WH+2 zxPl2RO<`M(EWlO26uuYw4H$40)A5}u12_kDbp0(5Rv7a5^5u1W&b<*6(L8Whc7$2P z7>|+6lcdjC^E1|5d8S61&;1x<>AB?O`K)7`!owRw1EFB(%TO?UB;s}N^tXj%U$=DO(V2yZ0 z{qWpNrhaFj-Ye?N{Z0V!xtC4Wh^rUCu%tM~;bM)9av6q8zf*BZCW+5|#~QQ;z2XhS zr=#)s=~(<^)mi6~*A_-P#1!*W{mloPxlOuc3eP0Dkzz-hLhJg)E=U%U< zj|t(>z7`pkox6On-_aCm>*DI#NS#MaIThFr_qXczz!a?*z97lbRq+df`ZJBYoXrcv zmM6a2CF;&EjS}p!hD&oifi8(}YrxEbrpt4Joh^L;evI0;cO0w)qv)V32wUTuoh_U8 zz!K}*fzId~R|VP+G(eB8kJX=qc^|(Uc>U^_BS2f`)WFOcZ3492OLK#_qR1}k=tMF zY2O+WZ#}VQ2io#j&;HotH(YM7E985=L)4vEw-3#0i{38Ftv%@V>kk)oJ=xaMx%;J_ zuI^1Xzj$-3EH*JVHMTNV5zUQFik6@KsORuWe=xAVbFg`ZdyVTr#}U_7?@QafJA;AN z4qmB4$+jEWmcCkx?2g#v4|@XJy0(=EnmwpFSm_3nl_iTCN`hf;PuD)5yE%wT{O@!e z%jCa4T72=yB^*&@M)QQNsw_~ZP@~EkDiJ2AvUZe@jvVY271z@&)|8a-q0qBhRo0M! zJ*&!E64}$LtfOpJtjc=I$5&P1gRgNq)2nhSO`~(FoHoLTrQsFLiohN@^e72{t72Q*0;^;83NIxV2*$UVs3SY-H>}(0DRikGTjYwCovXJT! z;XqGDqW%pl#6C8vo}00jf!#4+&?+{c06FAHICtL$hJGA?F5U<6i54KBx5Eq}aLNJ$Ua$=Ft@js0gQN zM)cKtbR};dQH00^w2=PmjEvZw1-o01c@6kffpxLMUxM_{d&#?7L-k5T@(hi*|D16? z{6`oX(U*GkOhQH*RwF%%p772%5YK0eVylE@vT_$B;PYrEUZ?WTfXAPIBQump8*Ee1 GEBXU`9Oi`p literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=300-500-700,CNTR=25-75.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=300-500-700,CNTR=25-75.otf new file mode 100644 index 0000000000000000000000000000000000000000..b7b353ae1ea3a25d5748c148c62041384c1fe445 GIT binary patch literal 3856 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=300-600.otf b/test/subset/data/expected/instantiate_cff2_partial/AdobeVFPrototype_vsindex.default.all.wght=300-600.otf new file mode 100644 index 0000000000000000000000000000000000000000..4e7f4d1b957a1288d0a91841d20480d3713ce1b8 GIT binary patch literal 3548 zcma)73vd)?9slp%CcrI^b*6(T-I|9rS`18h`)q_5xHp zxHtRl|NZ!V|L?oj&6`_kE)9{7b~LYB*YI0$caA8SA_{C;zon@y)w1>$BK0jIif#n| zm*Ay^M9LfB+gdl>)A0Dnz!db0!SC3#xoPwHH(z;{$hRB(srEzdy}<_G=V0##U%#uX zy@%@PD0tSd+yniqzgzec{1f1Jc6PMyp7+HgtKAf-_duz33o)C{-bJp(XN?t?+>K@_W8bEo)m5sEL}@i|_n{ky2X2 zo{e%*Jr1)laYE9cypT0jKd(4Q7n>}UN8A*EjO zjcDw>FssVh1`i|8JHojGSQnEjd&ER=UpO5K_0V=&Pb+~3?+q8F%04&1p8KuH6gh<- z1kZAosa(AGu$;4yGKYIta7t7@Ei6-&*^CbMOv*jGpv3Rr6*;Wt)310!{lJnE>OzlJ z=zirl9<9<`<)B{>Ym+JTz_FWlQU`6Jb+`(8!A0bI z80dG<-Lwg77wv;hH|>Y@yZM_(XhVd(bP(R{h<|hYhmdVAb)t@IR5P+4fTR~O`taR~ zm{qIw9<>p&-JlPm-iKh{|9|9afzKYq0Vk6^j6R(=>cG~$&)mI z>x4ywc1gQKQoahd{N9IoeE=1-)0Ys9t@c2=A2D|Van`flefWI}k+09tL@n5+J#(y8yov5b+Rj-rvM?n4e&NJdYbXa;+b|Z}Xx#Cr@zgA%w zxEz*y!gJCG-4}ozBhw3iUfY2I?@XAM$X$&=3u3L=o#w(O* zm_~)NbW5*L(nNaLh7B#A@dbf$x*$^7R95o#f?)rN$*yNl7xQDkEEY~ooS0R%3$s7G zdV6c#Y*9DotcYf#hP9yflGs17f5KWYXQC(uvxBD4gl5_c>gp~Pq(HW}b|{-4wnBl)HCGz4Clk6WoP-c|sHU}eGBKQoW@^pVhQy() zqX`|=K{FW{5yI8sJq4$V>fKJ0aH@p!oMsYDt@(j-$T4gYMGbc7w#oCQsj2hjDe;XX z==~)m7kkFB>_jpr6l{G=oCI*<7#6mUTxpOMTA``P)dpD-YIJSKHZ4?CicaVQ3ELPR z%(_WC6ez1jBbT!n7+HJ2a4c*?DDd%ECTHqtfi2^ncI8JCTE+?me=Ho{r_k-+)rT^+ z0n5^k$+sh-^u*NLBTmBA#6%K>ISIqgCBLk>c0Oj>Bm2JQYMD^YTVn5oj9!jjSuLzI zV!ObK(G)KntY~6aS7$P5WY%(0^Vd?hk+3Y&J$59OMu(-drj8ns`04Lt+?1Y<$1)kT zQd53@L=&#YiYL;JFswo`nan^@+E?xt1)!%z$I~ee@%)5%=C}|egBe$25JE+f;Yq84 z;5dD}`+@TOnC@gTgjE!Bqe;yL3f4Rz>XAk>EB)0YhGiB_jPNkagfJ~P z@21j*safV&XwhrKeJMAIbQ{ONQeKjHA?4_9%1Wh=>TV(%v$cHO3DvwdaxlloH=vj9 zl=lFP3>$5~`1zLnqryl5R@X6wHRd9d%LT=TkSKIVd29Kj<)!8A%goRfe!Rvk55EsVf0QQ6g5kxmm1OsVFKsLFhT9 zKq&*mQ)Ib)>%gN16%R6@>lgQ>FvZSvq%F17rl9f#){Z2$HodrwMwvE({Ba&x8 z-%(JQRX8yBiy`Rs&?{WEt{SqD1bGBs(k{2lLw4#yycc?U1^hWfn`)sifx|(c5xIJlg{xR|Jk&wrR-8tkYmk#csvRdQLQo zH7gp84#eZxD$&sGHTvSxNh|**i{&~jbos&`-}C;{wfyIi@21=#zX#PKGO&Z=i1@s? z=KGITlHg!pl348m4;^VGwyffbSY*F6f)gd#FK+>MeQcMuQ<^jrR;yyMS#7e+9WmE~ zCu?=K69ie5Bma8uFP@0xOpRlttMXd_rXnL}8YeRI9B?B@_ElDSCCEHmF--?OPKv;i zBoj{=_eJa+PiTYB>an<;ZSt5>*v=2%LQL8^9`Z@4CN4{~LV6}H%k+q}ATC=dpMH+Z z)-f0x)lfy;uFz7-h{?#un&3x0cJvXGWpp@T}`^=(^Vyse#a5k0;+9&AGFc*yN=_mMZCv>7==@)!Wn^6KtF-ur$>g3 z$mp;c(eMP-gpHduVfEf|Xu3M;y~~@@-U>FOw!i6EKvibuo@+i>z*S<;pi_7T3c6ZL%V7-5*TjQ-AQA9TaM5U-AxnWH;l^W4%A`{`2niC z5IPEo`E~=8!&`&hPz;w@shwoV*-x|v6k$&86-2LK5{mgqeG{|p=t3F#qz+MS&1a4E z0L~p#?UVJQ|82d1ea+PlHX_<6j$GSQZEP6*>WJ3f9X!g_ril7{7y|QV#%hm`@1{|D zD#WGWxKzbA5I!WTJ<8PoS17|8uk8$hckm<3_0FbKYX09iT@L;wH) literal 0 HcmV?d00001 From 88645fc2528e8b761065322b16e5f38b045752d1 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Jul 2026 22:53:13 -0600 Subject: [PATCH 044/112] [test/subset] Exercise vsindex machinery in CFF2 partial instancing Add AdobeVFPrototype_vsindex.otf (already used by test/api): two VarData subtables with distinct region sets and a charstring-level vsindex, covering VarData pruning/renumbering, vsindex remapping and the re-emitted charstring prefix. --- .../data/fonts/AdobeVFPrototype_vsindex.otf | Bin 0 -> 7036 bytes .../data/tests/instantiate_cff2_partial.tests | 1 + 2 files changed, 1 insertion(+) create mode 100644 test/subset/data/fonts/AdobeVFPrototype_vsindex.otf diff --git a/test/subset/data/fonts/AdobeVFPrototype_vsindex.otf b/test/subset/data/fonts/AdobeVFPrototype_vsindex.otf new file mode 100644 index 0000000000000000000000000000000000000000..3697b46c124cf364cb25afe73e9e5235b5c50892 GIT binary patch literal 7036 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 Date: Fri, 3 Jul 2026 22:55:44 -0600 Subject: [PATCH 045/112] [subset/cff2] Compute store sizes in 64-bit Contrived region/axis counts could wrap the 32-bit size accumulation in serialize_var_store past the 0xFFFF rejection check. --- src/hb-subset-cff2.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index a4e5060f5..687b15d9d 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -260,18 +260,18 @@ struct cff2_instancing_plan_t unsigned data_count = new_major_count; unsigned header_size = 2 + 4 + 2 + 4 * data_count; - unsigned offset = header_size; + uint64_t offset = header_size; hb_vector_t data_offsets; for (const vardata_transform_t &t : transforms) { if (!t.alive ()) continue; - data_offsets.push (offset); - offset += 6 + 2 * t.region_indices.length; + data_offsets.push ((unsigned) offset); + offset += 6 + 2 * (uint64_t) t.region_indices.length; } if (unlikely (data_offsets.in_error () || data_offsets.length != data_count)) return false; - unsigned regions_offset = offset; - unsigned total = offset + 4 + new_regions.length * axis_tags.length * 6; + unsigned regions_offset = (unsigned) offset; + uint64_t total = offset + 4 + (uint64_t) new_regions.length * axis_tags.length * 6; if (unlikely (total > 0xFFFFu)) return false; HBUINT16 *size_field = c->allocate_size (HBUINT16::static_size); From 28f4dc622fef010dab12f4275ac195b5d4a4a704 Mon Sep 17 00:00:00 2001 From: Heiko Lewin Date: Mon, 6 Jul 2026 17:53:38 +0200 Subject: [PATCH 046/112] [meson] Fix Android shared library suffix in CMake config (#6054) Meson does not version shared libraries on Android, so the generic unix case for generating harfbuzz-config.cmake results in a broken cmake config module. Assisted-by: OpenCode Reviewed-by: hlewin@worldiety.de Tested-by: hlewin@worldiety.de --- src/meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/meson.build b/src/meson.build index 819cf8c2a..cf4582e60 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1170,6 +1170,11 @@ elif host_machine.system() == 'windows' endif cmake_config.set('HB_IMPLIB_PREFIX', '${CMAKE_IMPORT_LIBRARY_PREFIX}') cmake_config.set('HB_IMPLIB_SUFFIX', '${CMAKE_IMPORT_LIBRARY_SUFFIX}') +elif host_machine.system() == 'android' + # Meson does not version shared libraries on Android. + cmake_config.set('HB_LIB_DIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_libdir)) + cmake_config.set('HB_LIB_PREFIX', '${CMAKE_SHARED_LIBRARY_PREFIX}') + cmake_config.set('HB_LIB_SUFFIX', '${CMAKE_SHARED_LIBRARY_SUFFIX}') else cmake_config.set('HB_LIB_DIR', '${PACKAGE_PREFIX_DIR}/@0@'.format(cmake_install_libdir)) cmake_config.set('HB_LIB_PREFIX', '${CMAKE_SHARED_LIBRARY_PREFIX}') From 9a55008395ec7760263ba89905976c806b6fe25d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 00:08:05 -0600 Subject: [PATCH 047/112] [vector-pdf] Fix PLTE chunk-length wrapping OOB read in PNG parser The PNG chunk-bounds check in hb_pdf_paint_image() used wrapping 32-bit unsigned arithmetic: if (pos + 12 + chunk_len > len) break; A large attacker-controlled chunk_len (e.g. 0xFFFFFF30) wraps pos + 12 + chunk_len below len, so a truncated PLTE chunk passes the check. The oversized plte_len is then trusted during palette serialization in add_xobject_png_image(), reading far past the input buffer -- an out-of-bounds read and deterministic crash. Rewrite the bounds checks to be non-wrapping, relying on the invariant pos <= len (len >= 8 is checked earlier): gate the loop on len - pos >= 12 and reject a chunk with chunk_len > len - pos - 12. This keeps pos <= len across pos += 12 + chunk_len and makes every in-loop read (chunk header and chunk payload) provably in bounds. Add a regression seed font that embeds a malformed indexed PNG with an oversized PLTE length via sbix. It reaches the vector-PDF paint path through hb_font_paint_glyph -> sbix::paint_glyph -> hb_pdf_paint_image and crashed pre-fix under ASAN at hb-vector-paint-pdf.cc:222; it now renders cleanly. Fixes: GHSA-9m78-3jcg-57f2 Co-Authored-By: Claude Opus 4.8 (1M context) --- src/hb-vector-paint-pdf.cc | 7 +++++-- .../fonts/sbix-png-plte-chunklen-oob.ttf | Bin 0 -> 14908 bytes 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 test/fuzzing/fonts/sbix-png-plte-chunklen-oob.ttf diff --git a/src/hb-vector-paint-pdf.cc b/src/hb-vector-paint-pdf.cc index 1acf72f9e..abfdf352f 100644 --- a/src/hb-vector-paint-pdf.cc +++ b/src/hb-vector-paint-pdf.cc @@ -680,11 +680,14 @@ hb_pdf_paint_image (hb_paint_funcs_t *, hb_vector_buf_t idat; unsigned pos = 8; - while (pos + 12 <= len) + /* Invariant: pos <= len (len >= 8 checked above). All bounds checks below + * are written to avoid 32-bit wrapping: a malicious chunk_len must not be + * able to wrap pos + 12 + chunk_len past the end of the buffer. */ + while (len - pos >= 12) { uint32_t chunk_len = hb_pdf_png_u32 (data + pos); uint32_t chunk_type = hb_pdf_png_u32 (data + pos + 4); - if (pos + 12 + chunk_len > len) + if (chunk_len > len - pos - 12) break; const uint8_t *chunk_data = data + pos + 8; diff --git a/test/fuzzing/fonts/sbix-png-plte-chunklen-oob.ttf b/test/fuzzing/fonts/sbix-png-plte-chunklen-oob.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b941b6884920bbcbb0a487d03deb5c6729be241b GIT binary patch literal 14908 zcmds;cUV)ww&*82h0r9S7m-i|1f_RSLQz1ZH>D$0KtV*M2qYA#3R0vgAgCZBpr9g% z#D*v;#YQK92%_{BTJkn}&Ux?L@80{pcmI5oZ_1iAv-a%Sv%`-y6Mz5!umKW40-}+P zoxYU(P6_}h0$h8}!bV|?!QxcnZDYJPA9x`9<4ZjXXx3BQw}VLRr*w!Mn&_JKj39v~WI!ToJvdFM%w zuwZ}#%&=Y>mIXtuV*l7?2iSk~*}l@h2NY@pkpa*E1r2zbQ*77!31{j0*< z!u%kh00M*YcMR~@)?wwJD?kAH0G9~>+8!Ak|I_fF)NkJa5{?pZ+%6x1rEQB6aL)2a zMuF`)#=u$xd`|=^b_N5M|KyC3p7lSi;R<+dYzLJ;>0g@!xV#-7|SfgP~)w~PdqK;s`}6wm@m|0tt@Ab9bQG6t?60H;6@2!*2?@B<#O`UGj>F|JU=6%s`78*8+l2r{AO{rwe6-=wSitch(Efk0w(mdK`@bIt;Xm}W zhsPBHkMab37pLH7@V`g)e{b_Yj%It6z=2V>{a*biVSClE!0Sc{K!%5o*n%B_9-*h; z`QKhu0A4fOdW5Iv$zb^1_`7Nmux?w6fNKzNzwI0iuOm*t4|c(pw%;KLe#;^F>9D{l z3b4ZIb_)o8-U#>uuZutVUwdreBrt|+w%_6ZCL)f(i**+OyvqQH-UeVVd}pe;0L2&& zKIKbDwlp_lXA#_9`|KvhhSqle|8+s-JFkE6%ru^|JfC9GPC z<;#nklTGmxjd9a2uPk;|tbD6`+fX$BzGUU={neg_uU+I#v_f~r!4|YB?xc;5i*RcGhX7+8tWYa}>0KcAJZf$!x z`zH5ia}uq;QSa8$+`H>K>0N6BPc?5WQJQOHvM0~gd{s>8S{rPZE?AVlG$?(sODefn zJa+YmpiKO1O@7mkn_s*f#<~G1(nxV%Kdkar{HY1D2tg zR6H%)QJ*e6pE(QtE{TcQU<%3w@!`~sS8~qfdPy%&3XWn3x6`DCq+*oG4SP*r$>~T2 zA=*s&5(h@e-(M#Muvrujwn+}HC4>(`s_T%YnA!dOADRl?gP8O^8H9DpCYL;=xxxJQ#-yBnK zoFR)~ShtZd&BGwpv+ef|y#p*ob^i2Tqf~e;;q%&AfRy+yElF9$P#7 zt|d8iWN|!I@|i7$!2KN3+jC~gWcSM2!WYNpc_i`49Hve3ZIn5={c+!Q^KZvMJJE`6 zQRC*B(2+CCFG1ijV1YQ}Tx$;O^k$o%EPt0SEa~{`>4P?8-bWv=&Y)%|a(f5gsr8U2 z-GTv5gyZ&J_X%+k&BH-CLlu@4v~g|8!k$1iU5N~-qeL)ys@J`t-#2Mgbj^SBN_*41 zP-50sM}CAo_-+wtiuov+@qBKRH$lHuwqt%rr(;2={ZS-;{aaG5yGCHM-pKKH#lE4F zn)JhYTw#l2*CUA*f)egR^^W%(RXwG33Ptu=ZybC1VS@H6W#OCTRbdGdhWTirf(mAJ zqs>bCz#Uxq=DnPlvupQxDSCdFeg{SR4D{FY9Go|qu1sdO6SNj0H6}dmm6W(unzxhQVvtu+ieA`Q}iA-Gcbqafh;@7KBDKY*Oq(?#= zdc+VC09eWUsTIvmV#bTk;qk#EL!=4s=3N^t-t38WkuMlL7^25pEE};vDp_xCbugXO z3fyCUcd$OaFc2EdEV8rf*z_6H2R1yx;zcJ9St=u1n9`J6H}d<-?g~r;6Zl^9Qo`IO ziS8w#ZA_vv2s8x*mPl*qFZdu0EL|vboi>s__Bh_sINVKT2NX?>$#SD*1mq!Dd%nEm znyQr8w|)f`d`KgaJp}w_oH9ma;K-1MWA9y^jxiPa(ee+tU-$;`P7HI&I0J(6ltF^R z(^ZQN#T!yJ7)6`{N%_U+#gMrmT8 za}?5ub?_x8>NR7YUn;=mk#>{`h~bS<$LGpzhF6;!3NC*D#px)@_uxZ_dMyeqZc>#M zkJ9tPdSTKCUz%%c;>dXviJsShQnW18TGM*r5F2!ni1IWbfmnB8{qr4-JhF(A83VAm z_ViE~d0whK$Voq53n_rW8)NQecRPM+F&Gk#j5|r{i3DhpE|=w|qLV3P1wp~6fLjD8 zAnvpfLFWaaT-T@4h8>kqN>CHhY3>XsSP*`Q@FRb}jFY5$9w@%4g*lwgRaMNs*8}?yT;2nW+g(GE~nU6fx?KFw_iCK?IS&?Kt(i5FW~S@m$P9$KC8m4EX~ot(*ju>HMdQB{Ee)In$`D3# znJh;O*5l|D3=TDnbQejJ!~pE0cOk9iy5iL$*MKSxB8i5%7NC8OGW?Wo_d}7ad63cj= zyHQ*6ibuE%1QC=lF{9d*!)=HLXijwJCHCiXd)-aw2R}nN)YoRpGl3`Y9Z1Gb@KXeY zTQnp=FT!td&~oUq3t}lb+1>uC!*@4864n#)*g~2NFO$FTq~EnbH4qmpQlpCz(vTiy zbmB@-wAjLpg#+0n)=i$RGoV&X0ab2Q{m}eV(YU-&Fx2zXfUmX81%zSf%%EP&51+=B zerwe8eeqU{KLtTLOoV1}d`aI#02PaR9zT8QK@aT=;w<<~8dJW(QLIBk%OO!2__PnI z{uxYucRz`tIkH~lZFz$kuw-3X_3kyNjOEBaJlnc}qhz>W_RSP?)*jQC9TYUF-o_pW zT;esLMqd8dyx*$*LMRrG7jz|Xo|GQO1-wJhhL+M(I_$SXF6F*2{~m; zJ1#x${F%D`X!UZ(KKcdJHAH1)EM$4U%_70ja?Z`@-rAR)NE@sEV&Zi~bj>^eC*7O* z^K42)QS`4El^cSbV?ivz=nO>0P@S>~bEFXYnGH6^m(*lu=j!IBj&(}BDEf)96{q>| zChLOKQFt^s0QlnrXiS%1SzYzks;^gzul9-Y1^(`2`py?T*OFPEYW1NU_wbArMeVMf?XMgd$thwJcG&79d`hm)gnWFuO6{aZv z=66w}8}2iv=LKF0UJOJJJ?SYAvOdk!$`~jDZ#eqSMfSf}Y@6XB_fk1l%RfmiEdMZL z54N*neC#VzACeFhw6$0fJ|W@lc9Hjc%(p=|r3`0RkyAC2#Fa0X%kEE>zQoDZTsZ;# zX1wnDbdhpnE!tPc-lx5Y=>4??(S`EcQr8xmA4UYEFcu{Tex9i6bKg`Ue|T+Csm8B+ zB5OYDS)c;Fc>PWc0&8#HrROa>1@qSb2x1BUC&czT|AAPTV2yM8-0%H@3D&8!?=QjH z6nugq)~RCLEVtXScEzrG*|KWcv}F89`!K$~z8>--|5WE4l50U*OOF53OrJMJXL{?>s7*O3w;mg1cReWxZ@S{$RY@Ld z$b9>-xaUF2*P2AQjbZ*^$Ahe|wMn1vC6rfH_CLJ*?#B7gPYTW#KOK0K(N}+|qau3n z@s;kovF~q2Jj*`uGXGTD_0ZubS)Z!n+RHD%7yWoU%HZ}gwK4lZM(2UDrHZ1<8iiBp zB}=MlogKGHFvLn_O~M?zH>pc8`J-fVuT} z1==Boo>(i)quC5b7-Q=Xm};HwV~A9*Zra#aBY6P>EiUn$|@BT+`9_I9KrRo{8g8p2@=1pMyc;23zgl2oOP!ZD$=Sy(15ZV6$LI7Yk-I6 z$Wb2=Leo%-E~V0#dkyDwwN z(W#!OEn`O*xo2ini)N`eNrrlR(;~<>>olh!6HH;3T*gff(eKC-fAURMaqW4a$|}*D zkZ~DD`~oE`i3+fCPeY!@TDXVNWacFMClr2zQ4_0umJOE_g+()M<%0Q)JVuSDp|Rt; zfE_FMdR`jRQZ7SrBAb=_O4R$nv#dHv!H)-9QQXZ?dU;(^Ak*pFN2%ixO}d6&kA7d|L>y`AGC;_0LO{RtEOPU8!1e##uJuP(_aF&IBzzg?E&L-6V! zB8+BD^1t;x?xErItsO?N{8iqoiMiQl^Ov0Si+y|?7 zW!7%X5jPM{n;Ut@KnQA9Xr~3YbBL&2Xb~7--UZwff_;CP@AD658A*4F3bWS4?s)4e zP9QC``*TZG8$>KjuIwuMyd&0~Z%ELCFDvkTr4{#MeQi`~;_SK2gotr~Ha7bBakMb^8`Cx|=cp@%4Qi|P>C|nP4R}Zn=h~Av|vSsm8AY^SWf^3r)5bv^? z{wPLLj6l+{^L-FK-ag-TplGOeHPXqMM9?q<2LO&d13-8qv0-X!6Gdkqwlu>K_2GdW zz*fYKJc#SUf^P;C;Q4bepR^(R^9AEj1uNlN=Y(MYVbYk_i=%SEGF()&5^0i%tis8p zPp6Z7*FDK~Yut|O7UAT*GwzD98AieTP)FRod3NiihUE3u1-Tdk%r_Xf2MJr}iR}66}*$ zK{kxA8BVH9R(z+nd2~1#0p-=8Ee}|JJL`EzH8xM~men)-h;0##@#y);_CVvAR3k>h zWFvE8B}&APDdF>Ogj{gGV>=o4xj2t43?F*o&Xn3_$3(1q?&z?Hx;bw*_DIQL%g5b6 z#BNTN|JdKqGSiX{Aovjs?}=7FaHSjO!)M%b;-7D6Z=Kx}_lDLSwP$q?)R0$mb5w-# zMZ$8o0%g5WPbsYWS47bp#*TO?#?$8+EE>+e7Mk?#pVNwCS&i2c|-wStZOi{I^)!>k?GRDI~w;-r(=rREhJt3+cMEFMKbYN(yLw6x9gb5dP=G$*JhQx$aG6)FIg+;9B57S z^xZ1WbCLeCQ(9Nck!dc98Mts!yVjc;js+t+ubI1j6{NU93gg3wSFEG~h}w;M*AAk8 ztlvcw4Vm>3b677at zsgvxbyKt1=PSj*eOSTT8Z@|&$j6bU6Nv}-9>)QByq^gda906_e(9RBzmHj+6DN z0eug$1j$2|m^{*0{pDQnAS?M9x=5b=gi+RWbhD z$?5N=fhC03=odL~AuKTl?xz$h@pU(e5Zi2N?-=dsg>h#hv315OZ_JHs^#?MSh;{C! zlsZW{1wrMftF4nT-EJ6nX3B83K9~ryA{S1<$cptNIW-46Kij7fJs+OWLJOxKSb-l@;CGM9_C1S_BzM{$}2sG(b&A-UQXyepd}!7Te(M7!u> zAd)oeM@9u3$Aun5nW%ei1XoPIO)OTKaBLfzdyJ+XLDxQNtC=~MPjHL&ziywff2}sA zz&F0oI7WuDi^_+Z8^71RMqYUT;E0HZlEaEjv^U4Nvw`5_s!cOejTW%ZzxHt8ez3zz zU-2tl->j^T&8s2P^ADtiewIm2CA=6Gq;f%k!ZK2`^8V->D}L-t zxy&CovzefqHakyOH!zjFBA_GY(CiYk3|{TAw9cg8)kg)@*WUHAGv3VZDdkU~9}SQ- z|FM)Cc1+)c#u14+L>gkPeL)>ysFeqen`)H1$&{&9o;dmL@Kxeu%EBrZPz--ob$TMC za=iRHJ(Rp{)>}SK>eCG?FWJsbhNM&2sL};DphG*=^X#*^FF9*@Y97@}BHGvfn1Ifc z^str)rq>u6E5V_vAo ziv&y^cX?T0-EZMo7We*}ERnYPTr}lL2Hv)PXAA z>WQ80A4BrxPK=JqGPRGM6z#aGeQ zgARaaUQes0;&Vd(r&x>q-&kv2u#L64S$#0p+82J($?Su%*0FTpKvtjAoe9`Cd#q;3 zBL5o+P9kgaD-Ud1`j!qfKI0hU*M%@Tt= zoiduU{LI77MZkz#aN0iiq|L1h#}5^a=LA??4?R{J@7<8pz7*`45Im;$rSBjIFeP`eIG3Un=0@Jx0%IS$k<#OyhD`lfc@Uj&$Y1mwG)dE<*o1EVn9D}mFeWG&G<5>eo9$DvP zjtI-gRe9jwa*E66JlXq!5~<6HS}%{x1!Q~74pGPqv4wVIrj!kDi8E*6fAW-K1- zj^#~)tCYzFV(3iGTij9^hJ7rY#4 zxwUb-?z6`N^{;%Fn48`jTQqIVi5}uLUcl1^iv(25F9qs_-JNNz?#mrqxQ8<4?0tY& z!+CjPA@LjhX}rkRfMajzjF^zfkMk5g1OJs5jbSFbyOj>cd@A?7$@w}Hd7Ybu$*TtM z+C)A+pAqRO&Hb_GI)3N{W65T1na^TDW=^*p<0rgR_&Qad@3n*5(=q#iWiGI}I-Nqj z=TG(hMizYS;QBP?SdE(%I9yOd0tMgf$a9BNgTCbSCA`27n0zLk`JF8P!KaQ(@m8%W$2e**U9ugi=evFzN` zmgcTfOwn~_#u?`ZM<}$(pu8=Z#j=-2 zk7*&kP?W#QkmT=O#Y_T1rGz{-X6A=QR!a`*@z%Mf{T?xgG~!}fa+n%gYRs8$JYAmt z`ucYITN}wa9y&jav@+a%b?iXUqkr)Uim|KkFo}zWXv|Jk34FUlfl`g_i89;2lEdIZ z6VQw&W2$Dro_Z>I?&Im(>bI$Gc}Kn?{Y110N0AkPNC-T0pe$BzaL$4KLLRX%CKe1W zx{haALcik`LUy(kNzoc9K(cBa^zBe#uQWNYkW_lAoJ)~%8O#2L8BOw|TKj{%wmV!B zWO0>y>w_EDf|a(4v9wU(%oRT>guuo!lYZDWm_8Yz%(^BH4&r8NGqg;=-U_llwq*AH zNd`!u}=Z)RZx%yjpc^nt=3b3Yu6H zmm5pM%+aLB_~`mdP!So0L-CS0wZfQ}kH(0S%8ev7N@!!dyw-oQeP@#Z_#Q+Bbp5`V z`$bJO5f#M*U0cd^WJ)pvxE_Qh!nf)bn?q{oX>)og&FtlU=8|Fo^{a$>PAqUCYq*N- z4FybOK}KL8NGkV{1=v7fOXe5MTE~($!&g59=VM;dodAgfQA?pZ8hWHgWgN3|V)X;R zdm@SrLY5?Hc9i6)ScC%=x_K%%$4@qKhthB=Y5XH8NR9G&btg%{y0XIAclr1eW~W-Q zTc1hd<02{ns%RXNc$N4rVn+|c4^jmEzI!RLk^O2ZpiW)F>$I9N4C@$-NRm>R33hw0-#)g!nTAKL7K+XF9%%GEXhjiqW{C*^7*eMY zO?UrYgSJ}&Nmyd%vft~#8vLa7k(KZmW_JrxXr2e?RK#ZHVpYf%D>e^uv3Ak!pXfRu z5(pupKRoztg5b9OOy<|mJMxz9N()%qp+eff@e4dc&{`41lj9Q+%-7M+qJ>qtSM>2C z7X#=*$cm#Ny1o0i_Sz?IW1IA=r>ckeGx&?Tz6-k2J#dO4}mJ$44uK`1~FqKHB?Ip%Ja$k}k$`$&Oi zZ$E-AN#cQaybijMo{6&SP*mZ$NH*ZK?Hgp7W3nKM>yRfLo|$GE#Zq%;iVv4r-9Ngi z;olH$Kp$c0%uAPcjlDAOEgvS}ECyevo*F|7DQ@MyDJU}g-Q|MHhc}c*Jeu|FchK%Z z{5+iz?+9DDx<+?zxLr^g4l2DPQPa3*QU-A5GZTL`;hW6)?im@^=v z7$#3G3%PQ@B(907H#9Dj@oqfE08y2h#J7XBu0wtp#jxCY>77WL4Ur~tYQAvH$cHo; zPn>OgW_ZZnTaXYJ42ar_ZR*|U=F2EDbam~`1vj~57tf8|{S~CN7$&Tp%JL`R=#yJT zY@HsCtAMoVQIqUdZyD)sD`msf<`&u=Xd|^ads;EN`@oo#@QmWNAC`fLKfd_>BQNiv z{~@q~#s3Jb2QqtMV0HKltW`ff>Q;{38ikn^2G)Pks`LF7i=qL`ye@~D75FfL`Q7F8 zqnai;U6+q(q&cX2T)2A0W&fq48p*b*i8d;6&PEQ&^^rk=CU=%$?Ij0|j6geBm29V$ z?V?@ct5@c)AK~qieoV9A_<@7P6Z!7@GaNN<`03pYFwno!dDT_t@==XL<;$ff^sjm9 zW;tu8+N-D7t6n~)mFc8)Aa~I4_OeOr1D&#^RC_hzt)*fg;&pFb%}bpym>MKKhdr%( zvM1$}JO6QL;Gb-odtK@oJZDz_&ZaP&{u50Zf7n#$uXB|Fqv?MNr7bX%!r}d&^lt(~ zX%8+b5Qb99KcUp+TpR)S`t)d?EY9q7iJ9)Ft=R_!euC#Hd#M=2lw8@I>Y z5$DLB`%+rt%uOOZz&3poQNVNNYurD0!zfVkPy>?Qcw~eyb^6baLW}-KIlwh}SVMZ^yvemip zC))olPXxL0{&yB|j_iHqyj6}1^~@f%8x=D5DY@-i;E}uiI1g=o+#g?s|A%iZl<@$MfWLl%^2qBq;x!+Ri3#XB2L2a2qndeHm#&y{J23c_Bmx|MK_)5 z%>1a<-W2r+)A6LGkzs08;954n>S&e<5Gv7I2T~`d)ahOPpH*T7p~+&lVbA%Dvwax| z93%*z1pXsrZH6|*!m3Y$r8;@;4wNQEVk_^`18A`(B9w);gf_WLe==OWp8c-OQfwPV*gO9U=<@Io|t>;8>%IF!1>M11gT zp|*yBI2J%nz&=jp$;+gb}&m+N+73gbxKoa8H zU32wD{66L=@8o>78*8wYEdPr-N(`9C4qd6fJsn?D)IS!z7G}?qS~9 zn4Z8ez;eT4K7CazRux|%V2Qo0LGF6qyOo67T=9tm*>v;ybPhvQ1S*{QnVvfUC&D={ zg`8D??$gLoGBHOpx~Pk96Xh0(m)6=r6n3sbWGKI{UIVs}5~JHbWHoOyaBA;dE*6(*nDJ z^~0b@xJqzMfmbd!;8uVDkn&TOe&zh*yG1FiD@A>0i5&w^AyZ?eBm@B%2S$JNx&*kv zn!#tN8TI*v5(Jg79JzYU>OBYRB0uvMVPnKB<<19l}LP{s$@;@cLHJ>vbx8Y$V{YQ~j^Kl1A9jT9 zR$eFv@0o42xEA&hNN<>on2b5F&WU=@el0Y<0CZyZ7Vle*gV;Is7D0Op(vlNu4kSNzCsTM< zk^_WgmdD9vjELx0Ejy_WO>9V#+J)}RbOP;itwmJ3<=$3(Iya@xXf8(`mx&@~;KQc) z+>3voy|wvBReMH67(w%V)W3hf@yVtmZO?W0ly5Fir7GU+SW-tk*lPd|e+!n}-8Le$ z;H_IU76fhXZa-&XVIlY;-zzvXX`me|hB?@3@hB&KyfX+7|7G=f+}^jzgua`3p_S(f zS)xvzI0HAh`kHTzbqhy!+TpdA3CZQ zez1`3PZI5mk-kCwDZ_4F^|}hI`Su3=oDFOIZNazhv}wQ3Q8q3^Q^jSpz@-8pbVg&e z&z7HQU(s6gqCeBD--EGXmUS51?xoxP;bZ3`k5haDdoJ?IdIpEg^?TS{ux6VvbZt_Q zA*SX z{a|BeG}fhk$)3u32W=%Q)qVDw%GT=gu#fYUm9fuZ zJ=nXcl|SxfbYOeaKDBdSQr8~%*lGTvy|&8ktf{|;PvPx)_}J;cj-YZqS}BI7%KTqU z$=KenhqvqJ!v3P64ucWY10O)W@n^?=yKe5U0#1KuZ5N+9z?;PX3WvA-rLW;5r+wAO z;q%g1_^6_oj4%>c9J9lgPB$N9k z_JQ8P#g*qR_t_&>hB1twZ}njupYJ0yP?v_I??%-Xy^gbeY=2jnq%9t(2L_u5&+grI zbJzpfRfsPk3)60Yb6y+WKfcPLjiX#;?IZ!rJ10>{{(y##jt<0Vy=pq=bnh#3)Ca7r zvyMNOeE?F_MKR2HR%;qgmz+c_xGmuDOSDSDBN;-EZrm`KUy)=P*ZZTxaAR==w-) zbn81Ng}F4fBJr}_hJjBrv2&j$u9XvXtE_uzUcB2z}}fyn~>NAXl^cz zsD~d9^u6KwwXs9hw-z-L5T|kW{HCn%wWSW1<^Yb{`H)`MUi^<6;VA+iQN8wBOKm3H63do;!HC z^Dhg7_SV_{@jC5P+ya{f$rj>sLh*;Y8joNay--BGj4bEq%sVf=|5I^ICq8FqhO^B*g>^ty#6q54Oi&gfEh%yszD5Z@! z{p>gnT`t*4Y+uY|PT6egp#+Fc_Rz{mOoYvR(nZQXX=Lq0cr<*lPA{$e(}?PwX>ulk z3U0Qfm8bw)3ajO-U=$q(CjH&dyM2dt9)62G4E-L>c%Gn=zhe*<)H7ZbQ>F!|;-=z3nsXmkd4vY)_FF^s|FYdL#11t_u)iVBjz) z(qqdD?T_DW&9ZecW=F|hP|-W34<0{8YUOyL?u$kibE5??qN3HXca5!ymy2{vZSV#j8!aY#VeYGOHg#|nD)JTu%H9Xl3L1hAAPj?T_W|b?pis!#L@{0e$ zw-!zc8`AyK^L&XHxhy}A%8bb)qHlnm@nq36!W+fbH>cB}l^QU&3knNm1{EjSj2L^m z>iUy5?}GO}bsI*BRLORqa`Dp=mir#65w2?tC-fQ2bA6Hl)DG+_jv`+?{aX=HDD;q) z6nZ)1+aU*trcmge{$v3ZEktG?9vCw=))ek~>U|h_;o65&yN;=mYGC)G$IHInsG6MH za#%`9I{RQV&?9(bpQDq+m$ki!eviNpmVH6MRYiI`mKI!PJL{vc+pbjP%DO? zMQ*ot-Y-eyeB|fQ152(l#X&_Yu5B(m%nl37+qFbtrp?_d3IBS$uh4~qhzdW@@y_lcsgNa?s{c`%9 zw<7Th?B^R& zwBwzAr9HnD%NwNL literal 0 HcmV?d00001 From 9072836ef5794d314734854bb61c856b437ac3b8 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 00:16:00 -0600 Subject: [PATCH 048/112] [vector-pdf] Fix indexed-PNG tRNS soft-mask dimension overflow hb_pdf_build_indexed_smask() computed its buffer sizes with unchecked 32-bit arithmetic: unsigned raw_len = (width + 1) * height; ... out->resize (width * height); width/height come straight from the attacker-controlled PNG IHDR (the vector-PDF path re-parses IHDR itself and does not clamp dimensions, unlike sbix). For width = height = 65536, (width + 1) * height wraps to 65536 and width * height wraps to 0. A crafted IDAT inflating to the wrapped raw_len passes the length check, the mask buffer is resized to zero, and the per-pixel loop then writes through out->arrayZ[y*width+x] and reads past raw -- an out-of-bounds write / NULL-page store and crash. Reject zero/degenerate dimensions and use hb_unsigned_mul_overflows() for both (width + 1) * height and width * height before allocating, sizing the inflate, and indexing. This bounds every subsequent raw + y*(width+1) and out->arrayZ[y*width+x] access. Add a CBDT regression seed embedding a 65536x65536 indexed PNG with a tRNS chunk; it reaches the soft-mask builder through hb_font_paint_glyph -> CBDT::paint_glyph -> hb_pdf_paint_image and crashed pre-fix under ASAN/UBSan at hb-vector-paint-pdf.cc:617. Fixes: GHSA-gmjm-qc3c-qfp8 Co-Authored-By: Claude Opus 4.8 (1M context) --- src/hb-vector-paint-pdf.cc | 15 +++++++++++++-- ...cbdt-png-indexed-trns-smask-dimension-oob.ttf | Bin 0 -> 876 bytes 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 test/fuzzing/fonts/cbdt-png-indexed-trns-smask-dimension-oob.ttf diff --git a/src/hb-vector-paint-pdf.cc b/src/hb-vector-paint-pdf.cc index abfdf352f..f28e1f866 100644 --- a/src/hb-vector-paint-pdf.cc +++ b/src/hb-vector-paint-pdf.cc @@ -546,8 +546,19 @@ hb_pdf_build_indexed_smask (hb_vector_buf_t *out, (void) width; (void) height; (void) trns; (void) trns_len; return false; #else + /* Guard the size arithmetic below against 32-bit overflow. width/height come + * from the attacker-controlled PNG IHDR; without this, (width + 1) * height or + * width * height can wrap and under-size buffers that are then indexed per + * pixel (raw + y * (width + 1), out->arrayZ[y * width + x]). */ + unsigned raw_len, mask_len; + if (!width || !height || + width == 0xFFFFFFFFu || + hb_unsigned_mul_overflows (width + 1, height, &raw_len) || + hb_unsigned_mul_overflows (width, height, &mask_len)) + return false; + /* Decompress IDAT (zlib). */ - unsigned raw_len = (width + 1) * height; /* 1 filter byte per row + width bytes */ + /* raw_len = (width + 1) * height: 1 filter byte per row + width bytes. */ uint8_t *raw = (uint8_t *) hb_malloc (raw_len); if (!raw) return false; HB_SCOPE_GUARD (hb_free (raw)); @@ -567,7 +578,7 @@ hb_pdf_build_indexed_smask (hb_vector_buf_t *out, return false; /* Un-filter and map to alpha. */ - if (!out->resize (width * height)) + if (!out->resize (mask_len)) return false; uint8_t *unfiltered = (uint8_t *) hb_malloc (width); diff --git a/test/fuzzing/fonts/cbdt-png-indexed-trns-smask-dimension-oob.ttf b/test/fuzzing/fonts/cbdt-png-indexed-trns-smask-dimension-oob.ttf new file mode 100644 index 0000000000000000000000000000000000000000..5227c3e7e7dfc8b69b5f3163e3a6967165f1da71 GIT binary patch literal 876 zcmbtSJ#5oZ5dPk?soauKvJ_NWkUD1dVtkx`aAXW%OP?Lye2wTO* zL>Unhuz*7k zfO|cPE4sCNfck`Vs$N@eP&Z9a(YcVb@Hx}|{NQ5$$zM2-c7Oj!?_~vFmhT^uX!A#N z(l*TaPRiWz(y7~&>8(jiE2-}@O7Bf9<0m Date: Wed, 8 Jul 2026 00:28:35 -0600 Subject: [PATCH 049/112] [ot] Fix NULL-deref when nullable output arrays are passed to list getters Several public "list getter" APIs document their output array as nullable (pass NULL to just query the total count without storing anything), but their implementations gated the copy only on the count pointer: if (count) { + source.sub_array (start_offset, count) | hb_sink (hb_array (out, *count)); // writes through out even if NULL } Passing a non-NULL count with a NULL output array on a populated table therefore wrote through the NULL pointer and crashed (SIGSEGV). Gate each copy on the output pointer as well (the same idiom already used by hb_color_line_get_color_stops: "if (count && out)"). This is a no-op when the output array is non-NULL and restores the documented behaviour of returning the total count when it is NULL. Affected getters: - hb_ot_color_palette_get_colors (CPAL) - hb_ot_color_glyph_get_layers (COLR v0) - hb_ot_meta_get_entry_tags (meta) - hb_aat_layout_get_feature_types (AAT feat) - hb_aat_layout_feature_type_get_selector_infos (AAT feat) - hb_ot_layout_feature_get_characters (GSUB cvXX) - hb_ot_layout_lookup_get_glyph_alternates (GSUB aalt) Add test/api/test-ot-nullable-output.c exercising each route with a NULL output array; every case crashed before this change. Fixes: GHSA-v5mv-8hhw-vff8 Co-Authored-By: Claude Opus 4.8 (1M context) --- src/OT/Color/COLR/COLR.hh | 2 +- src/OT/Color/CPAL/CPAL.hh | 2 +- src/OT/Layout/GSUB/AlternateSet.hh | 2 +- src/hb-aat-layout-feat-table.hh | 4 +- src/hb-ot-layout-common.hh | 2 +- src/hb-ot-meta-table.hh | 2 +- test/api/meson.build | 1 + test/api/test-ot-nullable-output.c | 131 +++++++++++++++++++++++++++++ 8 files changed, 139 insertions(+), 7 deletions(-) create mode 100644 test/api/test-ot-nullable-output.c diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index dd1dbd15d..39a8231ba 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -2121,7 +2121,7 @@ struct COLR hb_array_t all_layers = (this+layersZ).as_array (numLayers); hb_array_t glyph_layers = all_layers.sub_array (record.firstLayerIdx, record.numLayers); - if (count) + if (count && layers) { + glyph_layers.sub_array (start_offset, count) | hb_sink (hb_array (layers, *count)) diff --git a/src/OT/Color/CPAL/CPAL.hh b/src/OT/Color/CPAL/CPAL.hh index 9364fd939..ade2c1f86 100644 --- a/src/OT/Color/CPAL/CPAL.hh +++ b/src/OT/Color/CPAL/CPAL.hh @@ -209,7 +209,7 @@ struct CPAL hb_array_t all_colors ((this+colorRecordsZ).arrayZ, numColorRecords); hb_array_t palette_colors = all_colors.sub_array (start_index, numColors); - if (color_count) + if (color_count && colors) { + palette_colors.sub_array (start_offset, color_count) | hb_sink (hb_array (colors, *color_count)) diff --git a/src/OT/Layout/GSUB/AlternateSet.hh b/src/OT/Layout/GSUB/AlternateSet.hh index 0437cff46..24883580a 100644 --- a/src/OT/Layout/GSUB/AlternateSet.hh +++ b/src/OT/Layout/GSUB/AlternateSet.hh @@ -82,7 +82,7 @@ struct AlternateSet unsigned *alternate_count /* IN/OUT. May be NULL. */, hb_codepoint_t *alternate_glyphs /* OUT. May be NULL. */) const { - if (alternates.len && alternate_count) + if (alternates.len && alternate_count && alternate_glyphs) { + alternates.as_array ().sub_array (start_offset, alternate_count) | hb_sink (hb_array (alternate_glyphs, *alternate_count)) diff --git a/src/hb-aat-layout-feat-table.hh b/src/hb-aat-layout-feat-table.hh index 4fbec332e..2f02de338 100644 --- a/src/hb-aat-layout-feat-table.hh +++ b/src/hb-aat-layout-feat-table.hh @@ -114,7 +114,7 @@ struct FeatureName if (pdefault_index) *pdefault_index = default_index; - if (selectors_count) + if (selectors_count && selectors) { + settings_table.sub_array (start_offset, selectors_count) | hb_map ([=] (const SettingName& setting) { return setting.get_info (default_selector); }) @@ -168,7 +168,7 @@ struct feat unsigned int *count, hb_aat_layout_feature_type_t *features) const { - if (count) + if (count && features) { + namesZ.as_array (featureNameCount).sub_array (start_offset, count) | hb_map (&FeatureName::get_feature_type) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 09326dac3..17f5990a4 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -628,7 +628,7 @@ struct FeatureParamsCharacterVariants unsigned get_characters (unsigned start_offset, unsigned *char_count, hb_codepoint_t *chars) const { - if (char_count) + if (char_count && chars) { + characters.as_array ().sub_array (start_offset, char_count) | hb_sink (hb_array (chars, *char_count)) diff --git a/src/hb-ot-meta-table.hh b/src/hb-ot-meta-table.hh index 658db584c..5365774de 100644 --- a/src/hb-ot-meta-table.hh +++ b/src/hb-ot-meta-table.hh @@ -83,7 +83,7 @@ struct meta unsigned int *count, hb_ot_meta_tag_t *entries) const { - if (count) + if (count && entries) { + table->dataMaps.as_array ().sub_array (start_offset, count) | hb_map (&DataMap::get_tag) diff --git a/test/api/meson.build b/test/api/meson.build index 51d0a016b..7e91fa006 100644 --- a/test/api/meson.build +++ b/test/api/meson.build @@ -34,6 +34,7 @@ tests = [ 'test-ot-layout.c', 'test-ot-ligature-carets.c', 'test-ot-name.c', + 'test-ot-nullable-output.c', 'test-ot-math.c', 'test-ot-meta.c', 'test-ot-metrics.c', diff --git a/test/api/test-ot-nullable-output.c b/test/api/test-ot-nullable-output.c new file mode 100644 index 000000000..56e681300 --- /dev/null +++ b/test/api/test-ot-nullable-output.c @@ -0,0 +1,131 @@ +/* + * Copyright © 2026 Behdad Esfahbod + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#include "hb-test.h" + +#include +#include + +/* Regression test for GHSA-v5mv-8hhw-vff8: the "list getter" APIs document + * their output array as nullable ("may be NULL"; pass NULL to just query the + * count). Passing a NULL output array together with a non-NULL count on a + * populated table used to write through the NULL pointer and crash. Each case + * below calls the getter with a non-NULL count and a NULL output array on a + * font whose table is populated, and checks it returns the total without + * crashing. */ + +static void +test_nullable_output_cpal_colors (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/cpal-v0.ttf"); + unsigned int count = 100; + g_assert_cmpuint (hb_ot_color_palette_get_colors (face, 0, 0, &count, NULL), ==, 2); + hb_face_destroy (face); +} + +static void +test_nullable_output_colr_layers (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/cpal-v1.ttf"); + unsigned int count = 100; + g_assert_cmpuint (hb_ot_color_glyph_get_layers (face, 2, 0, &count, NULL), ==, 2); + hb_face_destroy (face); +} + +static void +test_nullable_output_meta_entries (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/meta.ttf"); + unsigned int count = 100; + unsigned int total = hb_ot_meta_get_entry_tags (face, 0, &count, NULL); + g_assert_cmpuint (total, >, 0); + hb_face_destroy (face); +} + +#ifndef HB_NO_AAT +static void +test_nullable_output_aat_feature_types (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/aat-feat.ttf"); + unsigned int count = 100; + g_assert_cmpuint (hb_aat_layout_get_feature_types (face, 0, &count, NULL), ==, 11); + hb_face_destroy (face); +} + +static void +test_nullable_output_aat_selector_infos (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/aat-feat.ttf"); + unsigned int count = 100; + g_assert_cmpuint (hb_aat_layout_feature_type_get_selector_infos ( + face, HB_AAT_LAYOUT_FEATURE_TYPE_DESIGN_COMPLEXITY_TYPE, + 0, &count, NULL, NULL), ==, 4); + hb_face_destroy (face); +} +#endif + +static void +test_nullable_output_cv_characters (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/cv01.otf"); + unsigned int feature_index; + if (hb_ot_layout_language_find_feature (face, HB_OT_TAG_GSUB, 0, + HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX, + HB_TAG ('c','v','0','1'), &feature_index)) + { + unsigned int count = 100; + g_assert_cmpuint (hb_ot_layout_feature_get_characters (face, HB_OT_TAG_GSUB, + feature_index, 0, + &count, NULL), ==, 2); + } + hb_face_destroy (face); +} + +static void +test_nullable_output_gsub_alternates (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansPro-Regular.otf"); + unsigned int count = 100; + g_assert_cmpuint (hb_ot_layout_lookup_get_glyph_alternates (face, 1, 1091, 0, + &count, NULL), ==, 7); + hb_face_destroy (face); +} + +int +main (int argc, char **argv) +{ + hb_test_init (&argc, &argv); + + hb_test_add (test_nullable_output_cpal_colors); + hb_test_add (test_nullable_output_colr_layers); + hb_test_add (test_nullable_output_meta_entries); +#ifndef HB_NO_AAT + hb_test_add (test_nullable_output_aat_feature_types); + hb_test_add (test_nullable_output_aat_selector_infos); +#endif + hb_test_add (test_nullable_output_cv_characters); + hb_test_add (test_nullable_output_gsub_alternates); + + return hb_test_run (); +} From a439a61f8faefbb4074494ee126774f8a5aafddc Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 00:30:40 -0600 Subject: [PATCH 050/112] [vector] Guard base64 output-length overflow in SVG image embedding hb_vector_buf_t::append_base64() sized its output as unsigned out_len = ((len + 2) / 3) * 4; which overflows 32-bit for a very large len (len + 2 wraps, and the * 4 wraps for len above ~3.2 GB). len is the attacker-controlled embedded PNG length on the vector SVG paint path (hb-vector-paint-svg.cc), so a wrapped out_len under-sizes the buffer while the encode loop still writes 4 bytes per 3 input bytes -- a heap out-of-bounds write. Compute the group count without the +2 (len / 3 + (len % 3 != 0)) and use hb_unsigned_mul_overflows()/hb_unsigned_add_overflows() so an oversized input fails the allocation instead of wrapping. resize_full() already rejects a size that does not fit in int, so the remaining path is safe. Assisted-by: Claude Opus 4.8 (1M context) --- src/hb-vector-buf.hh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/hb-vector-buf.hh b/src/hb-vector-buf.hh index 543cbddd7..5b2321dec 100644 --- a/src/hb-vector-buf.hh +++ b/src/hb-vector-buf.hh @@ -155,10 +155,13 @@ struct hb_vector_buf_t : hb_vector_t bool append_base64 (const uint8_t *data, unsigned len) { - unsigned out_len = ((len + 2) / 3) * 4; + /* Output is 4 bytes per 3 input bytes; compute without overflowing. */ + unsigned ngroups = len / 3 + (len % 3 != 0); + unsigned out_len; unsigned old_len = length; unsigned new_len; - if (unlikely (hb_unsigned_add_overflows (old_len, out_len, &new_len) || + if (unlikely (hb_unsigned_mul_overflows (ngroups, 4, &out_len) || + hb_unsigned_add_overflows (old_len, out_len, &new_len) || !resize_dirty ((int) new_len))) return false; From 7052cd343ed0f8ce8bdbf2d72a0bc8030e2b734b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 00:46:20 -0600 Subject: [PATCH 051/112] [GSUB] Fix NULL-deref in SingleSubst get_glyph_alternates hb_ot_layout_lookup_get_glyph_alternates() documents its alternate_glyphs output as nullable, and the AlternateSubst path was fixed in the previous commit. The Single-substitution fallback paths (SingleSubstFormat1 and SingleSubstFormat2, used when the queried lookup is a single-substitution) had the same defect: they gated the write on if (alternate_count && *alternate_count) and then did *alternate_glyphs = glyph_id without checking alternate_glyphs. Passing a NULL alternate_glyphs with a non-NULL, non-zero count on a covered glyph therefore wrote through NULL and crashed. Also require alternate_glyphs to be non-NULL before storing. Fixes: GHSA-v5mv-8hhw-vff8 Co-Authored-By: Claude Opus 4.8 (1M context) --- src/OT/Layout/GSUB/SingleSubstFormat1.hh | 2 +- src/OT/Layout/GSUB/SingleSubstFormat2.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OT/Layout/GSUB/SingleSubstFormat1.hh b/src/OT/Layout/GSUB/SingleSubstFormat1.hh index 1cd3f9d9c..2c2733d4c 100644 --- a/src/OT/Layout/GSUB/SingleSubstFormat1.hh +++ b/src/OT/Layout/GSUB/SingleSubstFormat1.hh @@ -109,7 +109,7 @@ struct SingleSubstFormat1_3 return 0; } - if (alternate_count && *alternate_count) + if (alternate_count && *alternate_count && alternate_glyphs) { hb_codepoint_t d = deltaGlyphID; hb_codepoint_t mask = get_mask (); diff --git a/src/OT/Layout/GSUB/SingleSubstFormat2.hh b/src/OT/Layout/GSUB/SingleSubstFormat2.hh index 4c98f05ae..8e6df7d63 100644 --- a/src/OT/Layout/GSUB/SingleSubstFormat2.hh +++ b/src/OT/Layout/GSUB/SingleSubstFormat2.hh @@ -89,7 +89,7 @@ struct SingleSubstFormat2_4 return 0; } - if (alternate_count && *alternate_count) + if (alternate_count && *alternate_count && alternate_glyphs) { glyph_id = substitute[index]; From 706a2ba8d3ec9d3b8f9ad8d6c54d20973a6867c0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 00:46:20 -0600 Subject: [PATCH 052/112] [ot] Guard remaining list-getter output arrays against NULL Following GHSA-v5mv-8hhw-vff8, sweep the rest of the public "list getter" APIs for the same defect: a NULL output array passed with a non-NULL count on a populated table wrote through the NULL pointer and crashed (SIGSEGV). These output params are not all annotated nullable, but the crash is reachable from public C APIs and is a straightforward DoS, so guard the write on the output pointer consistently (matching hb_color_line_get_color_stops and the fixes in the previous two commits). When the output is NULL the getter now just returns the total count. Getters hardened: - MathKern::get_entries (hb_ot_math_get_glyph_kernings) - MathGlyphAssembly::get_parts (hb_ot_math_get_glyph_assembly) - MathGlyphConstruction::get_variants (hb_ot_math_get_glyph_variants) - IndexArray::get_indexes (hb_ot_layout_language_get_feature_indexes, hb_ot_layout_feature_get_lookups, ...) - RecordListOf::get_tags (hb_ot_layout_table_get_script_tags, _get_feature_tags, _get_language_tags, ...) - AttachList::get_attach_points (hb_ot_layout_get_attach_points) - LigGlyph::get_lig_carets (hb_ot_layout_get_ligature_carets) - fvar get_axis_infos / get_axes_deprecated / get_instance_coords (hb_ot_var_get_axis_infos, hb_ot_var_get_axes, hb_ot_var_named_instance_get_design_coords) - OpenTypeOffsetTable / CoreText / face-builder get_table_tags (hb_face_get_table_tags) Extend test/api/test-ot-nullable-output.c with table-tags, fvar axis-info and MATH kerning cases; each crashed before this change. Assisted-by: Claude Opus 4.8 (1M context) --- src/OT/Layout/GDEF/GDEF.hh | 4 +-- src/hb-coretext.cc | 11 ++++---- src/hb-face-builder.cc | 11 +++++--- src/hb-open-file.hh | 2 +- src/hb-ot-layout-common.hh | 4 +-- src/hb-ot-math-table.hh | 6 ++--- src/hb-ot-var-fvar-table.hh | 6 ++--- test/api/test-ot-nullable-output.c | 40 ++++++++++++++++++++++++++++++ 8 files changed, 64 insertions(+), 20 deletions(-) diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh index e48354670..85b3a40e1 100644 --- a/src/OT/Layout/GDEF/GDEF.hh +++ b/src/OT/Layout/GDEF/GDEF.hh @@ -70,7 +70,7 @@ struct AttachList const AttachPoint &points = this+attachPoint[index]; - if (point_count) + if (point_count && point_array) { + points.as_array ().sub_array (start_offset, point_count) | hb_sink (hb_array (point_array, *point_count)) @@ -320,7 +320,7 @@ struct LigGlyph unsigned *caret_count /* IN/OUT */, hb_position_t *caret_array /* OUT */) const { - if (caret_count) + if (caret_count && caret_array) { + carets.as_array ().sub_array (start_offset, caret_count) | hb_map (hb_add (this)) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 7466c5bc7..4eeb451cc 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -107,11 +107,12 @@ _hb_cg_get_table_tags (const hb_face_t *face HB_UNUSED, end_offset = hb_min (end_offset, (unsigned) population); *table_count = end_offset - start_offset; - for (unsigned i = start_offset; i < end_offset; i++) - { - CTFontTableTag tag = (CTFontTableTag)(uintptr_t) CFArrayGetValueAtIndex (arr, i); - table_tags[i - start_offset] = tag; - } + if (table_tags) + for (unsigned i = start_offset; i < end_offset; i++) + { + CTFontTableTag tag = (CTFontTableTag)(uintptr_t) CFArrayGetValueAtIndex (arr, i); + table_tags[i - start_offset] = tag; + } return population; } diff --git a/src/hb-face-builder.cc b/src/hb-face-builder.cc index 579ef2747..cb55e4b8f 100644 --- a/src/hb-face-builder.cc +++ b/src/hb-face-builder.cc @@ -185,11 +185,14 @@ _hb_face_builder_get_table_tags (const hb_face_t *face HB_UNUSED, }); auto array = sorted_tags.as_array ().sub_array (start_offset, table_count); - auto out = hb_array (table_tags, *table_count); + if (table_tags) + { + auto out = hb_array (table_tags, *table_count); - + array.iter () - | hb_sink (out) - ; + + array.iter () + | hb_sink (out) + ; + } return population; } diff --git a/src/hb-open-file.hh b/src/hb-open-file.hh index 6a53a7eb3..58d2cdec9 100644 --- a/src/hb-open-file.hh +++ b/src/hb-open-file.hh @@ -88,7 +88,7 @@ typedef struct OpenTypeOffsetTable unsigned int *table_count, /* IN/OUT */ hb_tag_t *table_tags /* OUT */) const { - if (table_count) + if (table_count && table_tags) { + tables.as_array ().sub_array (start_offset, table_count) | hb_map (&TableRecord::tag) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 17f5990a4..ba263c825 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -441,7 +441,7 @@ struct IndexArray : Array16Of unsigned int *_count /* IN/OUT */, unsigned int *_indexes /* OUT */) const { - if (_count) + if (_count && _indexes) { + this->as_array ().sub_array (start_offset, _count) | hb_sink (hb_array (_indexes, *_count)) @@ -900,7 +900,7 @@ struct RecordArrayOf : SortedArray16Of> unsigned int *record_count /* IN/OUT */, hb_tag_t *record_tags /* OUT */) const { - if (record_count) + if (record_count && record_tags) { + this->as_array ().sub_array (start_offset, record_count) | hb_map (&Record::tag) diff --git a/src/hb-ot-math-table.hh b/src/hb-ot-math-table.hh index fe6c335ad..6be5d8e11 100644 --- a/src/hb-ot-math-table.hh +++ b/src/hb-ot-math-table.hh @@ -372,7 +372,7 @@ struct MathKern const MathValueRecord* kernValue = mathValueRecordsZ.arrayZ + heightCount; const unsigned int entriesCount = heightCount + 1; - if (entries_count) + if (entries_count && kern_entries) { unsigned int start = hb_min (start_offset, entriesCount); unsigned int end = hb_min (start + *entries_count, entriesCount); @@ -776,7 +776,7 @@ struct MathGlyphAssembly hb_ot_math_glyph_part_t *parts /* OUT */, hb_position_t *italics_correction /* OUT */) const { - if (parts_count) + if (parts_count && parts) { int64_t mult = font->dir_mult (direction); for (auto _ : hb_zip (partRecords.as_array ().sub_array (start_offset, parts_count), @@ -845,7 +845,7 @@ struct MathGlyphConstruction unsigned int *variants_count, /* IN/OUT */ hb_ot_math_glyph_variant_t *variants /* OUT */) const { - if (variants_count) + if (variants_count && variants) { int64_t mult = font->dir_mult (direction); for (auto _ : hb_zip (mathGlyphVariantRecord.as_array ().sub_array (start_offset, variants_count), diff --git a/src/hb-ot-var-fvar-table.hh b/src/hb-ot-var-fvar-table.hh index 4b4410f9b..dc92d5b64 100644 --- a/src/hb-ot-var-fvar-table.hh +++ b/src/hb-ot-var-fvar-table.hh @@ -285,7 +285,7 @@ struct fvar unsigned int *axes_count /* IN/OUT */, hb_ot_var_axis_t *axes_array /* OUT */) const { - if (axes_count) + if (axes_count && axes_array) { hb_array_t arr = get_axes ().sub_array (start_offset, axes_count); for (unsigned i = 0; i < arr.length; ++i) @@ -299,7 +299,7 @@ struct fvar unsigned int *axes_count /* IN/OUT */, hb_ot_var_axis_info_t *axes_array /* OUT */) const { - if (axes_count) + if (axes_count && axes_array) { hb_array_t arr = get_axes ().sub_array (start_offset, axes_count); for (unsigned i = 0; i < arr.length; ++i) @@ -360,7 +360,7 @@ struct fvar return 0; } - if (coords_length && *coords_length) + if (coords_length && *coords_length && coords) { hb_array_t instanceCoords = instance->get_coordinates (axisCount) .sub_array (0, coords_length); diff --git a/test/api/test-ot-nullable-output.c b/test/api/test-ot-nullable-output.c index 56e681300..fe2605db4 100644 --- a/test/api/test-ot-nullable-output.c +++ b/test/api/test-ot-nullable-output.c @@ -112,6 +112,43 @@ test_nullable_output_gsub_alternates (void) hb_face_destroy (face); } +static void +test_nullable_output_table_tags (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/cpal-v0.ttf"); + unsigned int count = 100; + unsigned int total = hb_face_get_table_tags (face, 0, &count, NULL); + g_assert_cmpuint (total, >, 0); + hb_face_destroy (face); +} + +static void +test_nullable_output_var_axis_infos (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/AdobeVFPrototype.abc.otf"); + unsigned int count = 100; + unsigned int total = hb_ot_var_get_axis_infos (face, 0, &count, NULL); + g_assert_cmpuint (total, >, 0); + hb_face_destroy (face); +} + +static void +test_nullable_output_math_kernings (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/MathTestFontFull.otf"); + hb_font_t *font = hb_font_create (face); + hb_codepoint_t glyph; + if (hb_font_get_glyph_from_name (font, "I", -1, &glyph)) + { + unsigned int count = 100; + g_assert_cmpuint (hb_ot_math_get_glyph_kernings (font, glyph, + HB_OT_MATH_KERN_TOP_RIGHT, + 0, &count, NULL), ==, 10); + } + hb_font_destroy (font); + hb_face_destroy (face); +} + int main (int argc, char **argv) { @@ -126,6 +163,9 @@ main (int argc, char **argv) #endif hb_test_add (test_nullable_output_cv_characters); hb_test_add (test_nullable_output_gsub_alternates); + hb_test_add (test_nullable_output_table_tags); + hb_test_add (test_nullable_output_var_axis_infos); + hb_test_add (test_nullable_output_math_kernings); return hb_test_run (); } From d287ee3ee24313a0a0025d035ace1be6d343daf7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 01:08:45 -0600 Subject: [PATCH 053/112] [ft] Fix get_table_tags returning no tags on streaming faces _hb_ft_get_table_tags() (used for FT faces created over a custom stream, i.e. when ft_face->stream->read is set) did if (!table_count) return population; else *table_count = 0; ... end_offset = hb_min (start_offset + *table_count, population); zeroing *table_count before using it as the requested buffer size, so end_offset collapsed to start_offset, the copy loop never ran, and hb_face_get_table_tags() always reported zero tags (and wrote none). Restructure to match the CoreText / face-builder / default backends: keep the caller's *table_count, check the start_offset + *table_count sum for overflow, clamp to the table population, then copy. Also guard the copy on table_tags so a NULL output array (count-only query) is handled. The existing FT test used FT_New_Memory_Face, whose in-memory face routes through the default blob table-tags path and never exercised this callback. Add a streaming-face variant (FT_Open_Face with a read stream) that does; it failed (count 0 vs 3) before this fix. Assisted-by: Claude Opus 4.8 (1M context) --- src/hb-ft.cc | 26 +++++++++------ test/api/test-get-table-tags.c | 59 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 8ac5db774..24557e584 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -1152,23 +1152,29 @@ _hb_ft_get_table_tags (const hb_face_t *face HB_UNUSED, if (!table_count) return population; - else - *table_count = 0; if (unlikely (start_offset >= population)) + { + *table_count = 0; return population; + } - unsigned end_offset = hb_min (start_offset + *table_count, (unsigned) population); - if (unlikely (end_offset < start_offset)) + unsigned end_offset = start_offset + *table_count; + if (unlikely (end_offset < start_offset)) /* Overflow. */ + { + *table_count = 0; return population; + } + end_offset = hb_min (end_offset, (unsigned) population); *table_count = end_offset - start_offset; - for (unsigned i = start_offset; i < end_offset; i++) - { - FT_ULong tag = 0, length; - FT_Sfnt_Table_Info (ft_face, i, &tag, &length); - table_tags[i - start_offset] = tag; - } + if (table_tags) + for (unsigned i = start_offset; i < end_offset; i++) + { + FT_ULong tag = 0, length; + FT_Sfnt_Table_Info (ft_face, i, &tag, &length); + table_tags[i - start_offset] = tag; + } return population; } diff --git a/test/api/test-get-table-tags.c b/test/api/test-get-table-tags.c index 192943708..960b1c53a 100644 --- a/test/api/test-get-table-tags.c +++ b/test/api/test-get-table-tags.c @@ -27,6 +27,7 @@ #include "hb-test.h" #include +#include #ifdef HAVE_FREETYPE #include #endif @@ -128,6 +129,63 @@ test_get_table_tags_ft (void) FT_Done_FreeType (ft_library); hb_blob_destroy (blob); } + +static unsigned long +_ft_stream_read (FT_Stream stream, + unsigned long offset, + unsigned char *buffer, + unsigned long count) +{ + hb_blob_t *blob = (hb_blob_t *) stream->descriptor.pointer; + unsigned int length; + const char *data = hb_blob_get_data (blob, &length); + if (offset > length) + return 0; + if (count == 0) /* Seek. */ + return 0; + if (offset + count > length) + count = length - offset; + memcpy (buffer, data + offset, count); + return count; +} + +static void +_ft_stream_close (FT_Stream stream HB_UNUSED) {} + +static void +test_get_table_tags_ft_stream (void) +{ + /* Exercise the streaming-face path, which (unlike an in-memory face) uses + * hb-ft's own _hb_ft_get_table_tags callback. */ + hb_face_t *source = hb_test_open_font_file ("fonts/Roboto-Regular.abc.ttf"); + hb_blob_t *blob = hb_face_reference_blob (source); + hb_face_destroy (source); + + FT_Library ft_library; + g_assert_cmpint (0, ==, FT_Init_FreeType (&ft_library)); + + FT_StreamRec stream = {0}; + stream.size = hb_blob_get_length (blob); + stream.descriptor.pointer = blob; + stream.read = _ft_stream_read; + stream.close = _ft_stream_close; + + FT_Open_Args args = {0}; + args.flags = FT_OPEN_STREAM; + args.stream = &stream; + + FT_Face ft_face; + g_assert_cmpint (0, ==, FT_Open_Face (ft_library, &args, 0, &ft_face)); + + hb_face_t *face = hb_ft_face_create (ft_face, NULL); + + _test_get_table_tags (face); + + hb_face_destroy (face); + FT_Done_Face (ft_face); + FT_Done_FreeType (ft_library); + hb_blob_destroy (blob); +} #endif #ifdef HAVE_CORETEXT @@ -167,6 +225,7 @@ main (int argc, char **argv) hb_test_add (test_get_table_tags_builder); #ifdef HAVE_FREETYPE hb_test_add (test_get_table_tags_ft); + hb_test_add (test_get_table_tags_ft_stream); #endif #ifdef HAVE_CORETEXT hb_test_add (test_get_table_tags_ct); From dba7469762f786de7269ad193cb1aadd6a189bad Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Jul 2026 01:12:27 -0600 Subject: [PATCH 054/112] [docs] Mark list-getter output arrays as nullable The list-getter APIs accept a NULL output array to query just the total count (and, since the preceding commits, do so safely). Annotate the output-array parameters (nullable) in the gtk-doc blocks so introspection bindings reflect that contract, matching the already-nullable CPAL/COLR getters. Covers hb_ot_meta_get_entry_tags, hb_aat_layout_get_feature_types, hb_ot_layout_feature_get_characters, hb_ot_layout_lookup_get_glyph_alternates, hb_ot_layout_get_attach_points, hb_ot_layout_get_ligature_carets, hb_ot_layout_table_get_script_tags / _get_feature_tags / _get_language_tags, hb_ot_layout_language_get_feature_indexes / _get_feature_tags, hb_ot_layout_feature_get_lookups / _with_variations_get_lookups, hb_ot_math_get_glyph_kernings / _assembly / _variants, hb_ot_var_get_axes / _get_axis_infos / _named_instance_get_design_coords, and hb_face_get_table_tags. Assisted-by: Claude Opus 4.8 (1M context) --- src/hb-aat-layout.cc | 2 +- src/hb-face.cc | 2 +- src/hb-face.h | 2 +- src/hb-ot-layout.cc | 22 +++++++++++----------- src/hb-ot-math.cc | 6 +++--- src/hb-ot-meta.cc | 2 +- src/hb-ot-var.cc | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc index a48c4e0bc..d6e758612 100644 --- a/src/hb-aat-layout.cc +++ b/src/hb-aat-layout.cc @@ -411,7 +411,7 @@ hb_aat_layout_track (const hb_ot_shape_plan_t *plan, * @start_offset: offset of the first feature type to retrieve * @feature_count: (inout) (optional): Input = the maximum number of feature types to return; * Output = the actual number of feature types returned (may be zero) - * @features: (out caller-allocates) (array length=feature_count): Array of feature types found + * @features: (out caller-allocates) (array length=feature_count) (nullable): Array of feature types found * * Fetches a list of the AAT feature types included in the specified face. * diff --git a/src/hb-face.cc b/src/hb-face.cc index b0cc787d0..ee633a624 100644 --- a/src/hb-face.cc +++ b/src/hb-face.cc @@ -909,7 +909,7 @@ hb_face_set_get_table_tags_func (hb_face_t *face, * @start_offset: The index of first table tag to retrieve * @table_count: (inout): Input = the maximum number of table tags to return; * Output = the actual number of table tags returned (may be zero) - * @table_tags: (out) (array length=table_count): The array of table tags found + * @table_tags: (out) (array length=table_count) (nullable): The array of table tags found * * Fetches a list of all table tags for a face, if possible. The list returned will * begin at the offset provided diff --git a/src/hb-face.h b/src/hb-face.h index b8386f0af..4e0902cfd 100644 --- a/src/hb-face.h +++ b/src/hb-face.h @@ -169,7 +169,7 @@ hb_face_get_glyph_count (const hb_face_t *face); * @start_offset: The index of first table tag to retrieve * @table_count: (inout): Input = the maximum number of table tags to return; * Output = the actual number of table tags returned (may be zero) - * @table_tags: (out) (array length=table_count): The array of table tags found + * @table_tags: (out) (array length=table_count) (nullable): The array of table tags found * @user_data: User data pointer passed by the caller * * Callback function for hb_face_get_table_tags(). diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index ecd511cbd..ea1ef1905 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -345,7 +345,7 @@ hb_ot_layout_get_glyphs_in_class (hb_face_t *face, * @start_offset: offset of the first attachment point to retrieve * @point_count: (inout) (nullable): Input = the maximum number of attachment points to return; * Output = the actual number of attachment points returned (may be zero) - * @point_array: (out) (array length=point_count): The array of attachment points found for the query + * @point_array: (out) (array length=point_count) (nullable): The array of attachment points found for the query * * Fetches a list of all attachment points for the specified glyph in the GDEF * table of the face. The list returned will begin at the offset provided. @@ -375,7 +375,7 @@ hb_ot_layout_get_attach_points (hb_face_t *face, * @start_offset: offset of the first caret position to retrieve * @caret_count: (inout) (nullable): Input = the maximum number of caret positions to return; * Output = the actual number of caret positions returned (may be zero) - * @caret_array: (out) (array length=caret_count): The array of caret positions found for the query + * @caret_array: (out) (array length=caret_count) (nullable): The array of caret positions found for the query * * Fetches a list of the caret positions defined for a ligature glyph in the GDEF * table of the font. The list returned will begin at the offset provided. @@ -446,7 +446,7 @@ get_gsubgpos_table (hb_face_t *face, * @start_offset: offset of the first script tag to retrieve * @script_count: (inout) (nullable): Input = the maximum number of script tags to return; * Output = the actual number of script tags returned (may be zero) - * @script_tags: (out) (array length=script_count): The array of #hb_tag_t script tags found for the query + * @script_tags: (out) (array length=script_count) (nullable): The array of #hb_tag_t script tags found for the query * * Fetches a list of all scripts enumerated in the specified face's GSUB table * or GPOS table. The list returned will begin at the offset provided. @@ -615,7 +615,7 @@ hb_ot_layout_table_select_script (hb_face_t *face, * @start_offset: offset of the first feature tag to retrieve * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return; * Output = the actual number of feature tags returned (may be zero) - * @feature_tags: (out) (array length=feature_count): Array of feature tags found in the table + * @feature_tags: (out) (array length=feature_count) (nullable): Array of feature tags found in the table * * Fetches a list of all feature tags in the given face's GSUB or GPOS table. * Note that there might be duplicate feature tags, belonging to different @@ -685,7 +685,7 @@ hb_ot_layout_table_find_feature (hb_face_t *face, * @start_offset: offset of the first language tag to retrieve * @language_count: (inout) (nullable): Input = the maximum number of language tags to return; * Output = the actual number of language tags returned (may be zero) - * @language_tags: (out) (array length=language_count): Array of language tags found in the table + * @language_tags: (out) (array length=language_count) (nullable): Array of language tags found in the table * * Fetches a list of language tags in the given face's GSUB or GPOS table, underneath * the specified script index. The list returned will begin at the offset provided. @@ -913,7 +913,7 @@ hb_ot_layout_language_get_required_feature (hb_face_t *face, * @start_offset: offset of the first feature tag to retrieve * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return; * Output: the actual number of feature tags returned (may be zero) - * @feature_indexes: (out) (array length=feature_count): The array of feature indexes found for the query + * @feature_indexes: (out) (array length=feature_count) (nullable): The array of feature indexes found for the query * * Fetches a list of all features in the specified face's GSUB table * or GPOS table, underneath the specified script and language. The list @@ -949,7 +949,7 @@ hb_ot_layout_language_get_feature_indexes (hb_face_t *face, * @start_offset: offset of the first feature tag to retrieve * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return; * Output = the actual number of feature tags returned (may be zero) - * @feature_tags: (out) (array length=feature_count): The array of #hb_tag_t feature tags found for the query + * @feature_tags: (out) (array length=feature_count) (nullable): The array of #hb_tag_t feature tags found for the query * * Fetches a list of all features in the specified face's GSUB table * or GPOS table, underneath the specified script and language. The list @@ -1037,7 +1037,7 @@ hb_ot_layout_language_find_feature (hb_face_t *face, * @start_offset: offset of the first lookup to retrieve * @lookup_count: (inout) (nullable): Input = the maximum number of lookups to return; * Output = the actual number of lookups returned (may be zero) - * @lookup_indexes: (out) (array length=lookup_count): The array of lookup indexes found for the query + * @lookup_indexes: (out) (array length=lookup_count) (nullable): The array of lookup indexes found for the query * * Fetches a list of all lookups enumerated for the specified feature, in * the specified face's GSUB table or GPOS table. The list returned will @@ -1475,7 +1475,7 @@ hb_ot_layout_table_find_feature_variations (hb_face_t *face, * @start_offset: offset of the first lookup to retrieve * @lookup_count: (inout) (nullable): Input = the maximum number of lookups to return; * Output = the actual number of lookups returned (may be zero) - * @lookup_indexes: (out) (array length=lookup_count): The array of lookups found for the query + * @lookup_indexes: (out) (array length=lookup_count) (nullable): The array of lookups found for the query * * Fetches a list of all lookups enumerated for the specified feature, in * the specified face's GSUB table or GPOS table, enabled at the specified @@ -1854,7 +1854,7 @@ hb_ot_layout_feature_get_name_ids (hb_face_t *face, * @start_offset: offset of the first character to retrieve * @char_count: (inout) (nullable): Input = the maximum number of characters to return; * Output = the actual number of characters returned (may be zero) - * @characters: (out caller-allocates) (array length=char_count): A buffer pointer. + * @characters: (out caller-allocates) (array length=char_count) (nullable): A buffer pointer. * The Unicode codepoints of the characters for which this feature provides * glyph variants. * @@ -2629,7 +2629,7 @@ struct hb_get_glyph_alternates_dispatch_t : * @start_offset: starting offset. * @alternate_count: (inout) (nullable): Input = the maximum number of alternate glyphs to return; * Output = the actual number of alternate glyphs returned (may be zero). - * @alternate_glyphs: (out caller-allocates) (array length=alternate_count): A glyphs buffer. + * @alternate_glyphs: (out caller-allocates) (array length=alternate_count) (nullable): A glyphs buffer. * Alternate glyphs associated with the glyph id. * * Fetches alternates of a glyph from a given GSUB lookup index. Note that for one-to-one GSUB diff --git a/src/hb-ot-math.cc b/src/hb-ot-math.cc index 719a802d5..91ef8a894 100644 --- a/src/hb-ot-math.cc +++ b/src/hb-ot-math.cc @@ -206,7 +206,7 @@ hb_ot_math_get_glyph_kerning (hb_font_t *font, * @start_offset: offset of the first kern entry to retrieve * @entries_count: (inout) (optional): Input = the maximum number of kern entries to return; * Output = the actual number of kern entries returned - * @kern_entries: (out caller-allocates) (array length=entries_count): array of kern entries returned + * @kern_entries: (out caller-allocates) (array length=entries_count) (nullable): array of kern entries returned * * Fetches the raw MathKern (cut-in) data for the specified font, glyph index, * and @kern. The corresponding list of kern values and correction heights is @@ -251,7 +251,7 @@ hb_ot_math_get_glyph_kernings (hb_font_t *font, * @start_offset: offset of the first variant to retrieve * @variants_count: (inout): Input = the maximum number of variants to return; * Output = the actual number of variants returned - * @variants: (out) (array length=variants_count): array of variants returned + * @variants: (out) (array length=variants_count) (nullable): array of variants returned * * Fetches the MathGlyphConstruction for the specified font, glyph index, and * direction. The corresponding list of size variants is returned as a list of @@ -313,7 +313,7 @@ hb_ot_math_get_min_connector_overlap (hb_font_t *font, * @start_offset: offset of the first glyph part to retrieve * @parts_count: (inout): Input = maximum number of glyph parts to return; * Output = actual number of parts returned - * @parts: (out) (array length=parts_count): the glyph parts returned + * @parts: (out) (array length=parts_count) (nullable): the glyph parts returned * @italics_correction: (out): italics correction of the glyph assembly * * Fetches the GlyphAssembly for the specified font, glyph index, and direction. diff --git a/src/hb-ot-meta.cc b/src/hb-ot-meta.cc index 35c8eb523..99ada452b 100644 --- a/src/hb-ot-meta.cc +++ b/src/hb-ot-meta.cc @@ -42,7 +42,7 @@ * @face: a face object * @start_offset: iteration's start offset * @entries_count:(inout) (optional): buffer size as input, filled size as output - * @entries: (out caller-allocates) (array length=entries_count): entries tags buffer + * @entries: (out caller-allocates) (array length=entries_count) (nullable): entries tags buffer * * Fetches all available feature types. * diff --git a/src/hb-ot-var.cc b/src/hb-ot-var.cc index 72ef9fbbd..5c2016fe4 100644 --- a/src/hb-ot-var.cc +++ b/src/hb-ot-var.cc @@ -89,7 +89,7 @@ hb_ot_var_get_axis_count (hb_face_t *face) * @start_offset: offset of the first lookup to retrieve * @axes_count: (inout) (optional): Input = the maximum number of variation axes to return; * Output = the actual number of variation axes returned (may be zero) - * @axes_array: (out caller-allocates) (array length=axes_count): The array of variation axes found + * @axes_array: (out caller-allocates) (array length=axes_count) (nullable): The array of variation axes found * * Fetches a list of all variation axes in the specified face. The list returned will begin * at the offset provided. @@ -135,7 +135,7 @@ hb_ot_var_find_axis (hb_face_t *face, * @start_offset: offset of the first lookup to retrieve * @axes_count: (inout) (optional): Input = the maximum number of variation axes to return; * Output = the actual number of variation axes returned (may be zero) - * @axes_array: (out caller-allocates) (array length=axes_count): The array of variation axes found + * @axes_array: (out caller-allocates) (array length=axes_count) (nullable): The array of variation axes found * * Fetches a list of all variation axes in the specified face. The list returned will begin * at the offset provided. @@ -239,7 +239,7 @@ hb_ot_var_named_instance_get_postscript_name_id (hb_face_t *face, * @instance_index: The index of the named instance to query * @coords_length: (inout) (optional): Input = the maximum number of coordinates to return; * Output = the actual number of coordinates returned (may be zero) - * @coords: (out) (array length=coords_length): The array of coordinates found for the query + * @coords: (out) (array length=coords_length) (nullable): The array of coordinates found for the query * * Fetches the design-space coordinates corresponding to the given * named instance in the face. From 6c0ec851c55fddc6b88a4db4bb217587aa428c01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 10:12:44 +0000 Subject: [PATCH 055/112] Bump github/codeql-action/upload-sarif from 4.36.2 to 4.36.3 Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.36.2 to 4.36.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/8aad20d150bbac5944a9f9d289da16a4b0d87c1e...54f647b7e1bb85c95cddabcd46b0c578ec92bc1a) --- updated-dependencies: - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.36.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 4157a3fa7..64bb10f65 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5 + uses: github/codeql-action/upload-sarif@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v3.29.5 with: sarif_file: results.sarif From eb6d2466f8817d888e2368821b85408fe3e1be97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 10:13:01 +0000 Subject: [PATCH 056/112] Bump setuptools from 82.0.1 to 83.0.0 in /.ci Bumps [setuptools](https://github.com/pypa/setuptools) from 82.0.1 to 83.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v82.0.1...v83.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-version: 83.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .ci/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/requirements.txt b/.ci/requirements.txt index 4114ca843..3b47037e4 100644 --- a/.ci/requirements.txt +++ b/.ci/requirements.txt @@ -133,7 +133,7 @@ ninja==1.13.0 \ # via -r requirements.in # The following packages are considered to be unsafe in a requirements file: -setuptools==82.0.1 \ - --hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \ - --hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb +setuptools==83.0.0 \ + --hash=sha256:025bccbbf0fa05b6192bc64ae1e7b16e001fd6d6d4d5de03c97b1c1ade523bef \ + --hash=sha256:29b23c360f22f414dc7336bb39178cc7bcbf6021ed2733cde173f09dba19abb3 # via -r requirements.in From 04f7a60bc424beaba0e4ba8998a8d9e4a1b921f6 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 8 Jul 2026 20:11:16 +0300 Subject: [PATCH 057/112] [draw] Promote quadratic curves to cubics in double precision (#6057) The fallback quadratic-to-cubic promotion works in single precision. This results in different rounding values for different architectures. Promote in double precision instead, which rounds deterministically. Add a PDF test that exercises this, and make the test runner handle PDF expectations. This also effectively reverts d4511648db41f76fbb243e82455040d6483b0a08 --- src/hb-draw.cc | 18 ++- .../data/expected/basic/glyf-quadratics.pdf | 116 ++++++++++++++++++ test/vector/data/tests/basic.tests | 1 + test/vector/run-tests.py | 7 +- 4 files changed, 134 insertions(+), 8 deletions(-) create mode 100644 test/vector/data/expected/basic/glyf-quadratics.pdf diff --git a/src/hb-draw.cc b/src/hb-draw.cc index 0997153f8..11f4e9a1f 100644 --- a/src/hb-draw.cc +++ b/src/hb-draw.cc @@ -65,12 +65,20 @@ hb_draw_quadratic_to_nil (hb_draw_funcs_t *dfuncs, void *draw_data, float to_x, float to_y, void *user_data HB_UNUSED) { -#define HB_TWO_THIRD 0.66666666666666666666666667f + /* Compute in double precision, so that the result does not depend + * on how the compiler evaluates float expressions. */ +#define HB_TWO_THIRD 0.66666666666666666666666667 + double current_x = (double) st->current_x; + double current_y = (double) st->current_y; + double cx = (double) control_x; + double cy = (double) control_y; + double tx = (double) to_x; + double ty = (double) to_y; dfuncs->emit_cubic_to (draw_data, *st, - st->current_x + (control_x - st->current_x) * HB_TWO_THIRD, - st->current_y + (control_y - st->current_y) * HB_TWO_THIRD, - to_x + (control_x - to_x) * HB_TWO_THIRD, - to_y + (control_y - to_y) * HB_TWO_THIRD, + (float) (current_x + (cx - current_x) * HB_TWO_THIRD), + (float) (current_y + (cy - current_y) * HB_TWO_THIRD), + (float) (tx + (cx - tx) * HB_TWO_THIRD), + (float) (ty + (cy - ty) * HB_TWO_THIRD), to_x, to_y); #undef HB_TWO_THIRD } diff --git a/test/vector/data/expected/basic/glyf-quadratics.pdf b/test/vector/data/expected/basic/glyf-quadratics.pdf new file mode 100644 index 000000000..d13a2c5c9 --- /dev/null +++ b/test/vector/data/expected/basic/glyf-quadratics.pdf @@ -0,0 +1,116 @@ +%PDF-1.4 +%ÀÁÂÃ +1 0 obj +<< /Type /Catalog /Pages 2 0 R >> +endobj +2 0 obj +<< /Type /Pages /Kids [3 0 R] /Count 1 >> +endobj +3 0 obj +<< /Type /Page /Parent 2 0 R /MediaBox [-16 -60816 106736 16016] /Contents 4 0 R >> +endobj +4 0 obj +<< /Length 2625 >> +stream +1 1 1 rg +-16 -60816 106752 76832 re f +0 0 0 rg +25856 0 m +25514.67 682.67 25237.33 1898.67 25024 3648 c +22272 789.33 18986.67 -640 15168 -640 c +11754.67 -640 8954.67 325.33 6768 2256 c +4581.33 4186.67 3488 6634.67 3488 9600 c +3488 13205.33 4858.67 16005.33 7600 18000 c +10341.33 19994.67 14197.33 20992 19168 20992 c +24928 20992 l +24928 23712 l +24928 25781.33 24309.33 27429.33 23072 28656 c +21834.67 29882.67 20010.67 30496 17600 30496 c +15488 30496 13717.33 29962.67 12288 28896 c +10858.67 27829.33 10144 26538.67 10144 25024 c +4192 25024 l +4192 26752 4805.33 28421.33 6032 30032 c +7258.67 31642.67 8922.67 32917.33 11024 33856 c +13125.33 34794.67 15434.67 35264 17952 35264 c +21941.33 35264 25066.67 34266.67 27328 32272 c +29589.33 30277.33 30762.67 27530.67 30848 24032 c +30848 8096 l +30848 4917.33 31253.33 2389.33 32064 512 c +32064 0 l +25856 0 l +h +16032 4512 m +17888 4512 19648 4992 21312 5952 c +22976 6912 24181.33 8160 24928 9696 c +24928 16800 l +20288 16800 l +13034.67 16800 9408 14677.33 9408 10432 c +9408 8576 10026.67 7125.33 11264 6080 c +12501.33 5034.67 14090.67 4512 16032 4512 c +h +f +0 0 0 rg +69440 16928 m +69440 11637.33 68224 7386.67 65792 4176 c +63360 965.33 60096 -640 56000 -640 c +51626.67 -640 48245.33 906.67 45856 4000 c +45568 0 l +40128 0 l +40128 49152 l +46048 49152 l +46048 30816 l +48437.33 33781.33 51733.33 35264 55936 35264 c +60138.66 35264 63440 33674.67 65840 30496 c +68240 27317.33 69440 22965.33 69440 17440 c +69440 16928 l +h +63520 17600 m +63520 21632 62741.34 24746.67 61184 26944 c +59626.66 29141.33 57386.66 30240 54464 30240 c +50560 30240 47754.67 28426.67 46048 24800 c +46048 9824 l +47861.33 6197.33 50688 4384 54528 4384 c +57365.34 4384 59573.34 5482.67 61152 7680 c +62730.66 9877.33 63520 13184 63520 17600 c +h +f +0 0 0 rg +90784 4192 m +92896 4192 94741.34 4832 96320 6112 c +97898.66 7392 98773.34 8992 98944 10912 c +104544 10912 l +104437.34 8928 103754.66 7040 102496 5248 c +101237.34 3456 99557.34 2026.67 97456 960 c +95354.66 -106.67 93130.66 -640 90784 -640 c +86069.34 -640 82320 933.33 79536 4080 c +76752 7226.67 75360 11530.67 75360 16992 c +75360 17984 l +75360 21354.67 75978.66 24352 77216 26976 c +78453.34 29600 80229.34 31637.33 82544 33088 c +84858.66 34538.67 87594.66 35264 90752 35264 c +94634.66 35264 97861.34 34101.33 100432 31776 c +103002.66 29450.67 104373.34 26432 104544 22720 c +98944 22720 l +98773.34 24960 97925.34 26800 96400 28240 c +94874.66 29680 92992 30400 90752 30400 c +87744 30400 85413.34 29317.33 83760 27152 c +82106.66 24986.67 81280 21856 81280 17760 c +81280 16640 l +81280 12650.67 82101.34 9578.67 83744 7424 c +85386.66 5269.33 87733.34 4192 90784 4192 c +h +f +endstream +endobj +xref +0 5 +0000000000 65535 f +0000000015 00000 n +0000000064 00000 n +0000000121 00000 n +0000000220 00000 n +trailer +<< /Size 5 /Root 1 0 R >> +startxref +2896 +%%EOF diff --git a/test/vector/data/tests/basic.tests b/test/vector/data/tests/basic.tests index ba33a715c..426e6a0ff 100644 --- a/test/vector/data/tests/basic.tests +++ b/test/vector/data/tests/basic.tests @@ -13,3 +13,4 @@ ../../../fuzzing/fonts/noto_handwriting-glyf_colr_1.ttf;;U+270D;../expected/basic/handwriting-glyf-colr-1.svg ../../../fuzzing/fonts/noto_handwriting-cff_colr_1.otf;;U+270D;../expected/basic/handwriting-cff-colr-1.svg ../../../fuzzing/fonts/noto_handwriting-cff2_colr_1.otf;;U+270D;../expected/basic/handwriting-cff-colr-1.svg +../../../api/fonts/Roboto-Regular.abc.ttf;--font-size=65536;U+0061,U+0062,U+0063;../expected/basic/glyf-quadratics.pdf diff --git a/test/vector/run-tests.py b/test/vector/run-tests.py index 8436900d9..95823c757 100755 --- a/test/vector/run-tests.py +++ b/test/vector/run-tests.py @@ -199,7 +199,8 @@ try: print("# " + str(e)) continue - with tempfile.NamedTemporaryFile(prefix="hb-vector-test-", suffix=".svg", delete=False) as tmp: + suffix = os.path.splitext(expected_file)[1] + with tempfile.NamedTemporaryFile(prefix="hb-vector-test-", suffix=suffix, delete=False) as tmp: output_path = tmp.name try: @@ -220,9 +221,9 @@ try: print("# hb-vector did not create output file") continue - with open(expected_path, encoding="utf-8") as fp: + with open(expected_path, encoding="utf-8", errors="surrogateescape") as fp: expected = fp.read() - with open(output_path, encoding="utf-8") as fp: + with open(output_path, encoding="utf-8", errors="surrogateescape") as fp: actual = fp.read() if actual == expected: From a1b0b0046cba156dd72c1a40063ef6ee1b9c6f19 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 8 Jul 2026 12:54:07 +0300 Subject: [PATCH 058/112] [test/vector] Test painting a COLRv0 glyph at a large font scale Add a test for painting a COLRv0 glyph at large scale. The output shows the glyph clipped. We will fix this in the next commits. --- .../expected/basic/colrv0-large-scale.pdf | 165 ++++++++++++++++++ .../expected/basic/colrv0-large-scale.svg | 17 ++ test/vector/data/tests/basic.tests | 2 + 3 files changed, 184 insertions(+) create mode 100644 test/vector/data/expected/basic/colrv0-large-scale.pdf create mode 100644 test/vector/data/expected/basic/colrv0-large-scale.svg diff --git a/test/vector/data/expected/basic/colrv0-large-scale.pdf b/test/vector/data/expected/basic/colrv0-large-scale.pdf new file mode 100644 index 000000000..79237fd92 --- /dev/null +++ b/test/vector/data/expected/basic/colrv0-large-scale.pdf @@ -0,0 +1,165 @@ +%PDF-1.4 +%ÀÁÂÃ +1 0 obj +<< /Type /Catalog /Pages 2 0 R >> +endobj +2 0 obj +<< /Type /Pages /Kids [3 0 R] /Count 1 >> +endobj +3 0 obj +<< /Type /Page /Parent 2 0 R /MediaBox [-16 -57360 65552 8208] +/Contents 4 0 R >> +endobj +4 0 obj +<< /Length 4593 >> +stream +1 1 1 rg +-16 -57360 65568 65568 re f +q +1 0 0 1 0 0 cm +q +55936 47744 m +62336 41344 65536 33621.33 65536 24576 c +65536 15530.67 62336 7808 55936 1408 c +49536 -4992 41813.33 -8192 32768 -8192 c +23722.67 -8192 16000 -4992 9600 1408 c +3200 7808 0 15530.67 0 24576 c +0 33621.33 3200 41344 9600 47744 c +16000 54144 23722.67 57344 32768 57344 c +41813.33 57344 49536 54144 55936 47744 c +h +W n +0.8667 0.1804 0.2667 rg +-32767 -32767 65534 65534 re f +Q +q +25472 35200 m +26410.67 35200 26880 34645.33 26880 33536 c +26880 32426.67 26410.67 31872 25472 31872 c +20992 31872 l +22101.33 29312 23637.33 27050.67 25600 25088 c +25941.33 24746.67 26112 24320 26112 23808 c +26112 23381.33 25984 22997.33 25728 22656 c +25386.67 22314.67 25002.67 22144 24576 22144 c +24064 22144 23594.67 22357.33 23168 22784 c +22144 24234.67 21162.67 26112 20224 28416 c +20650.67 25344 20864 22869.33 20864 20992 c +20864 3456 l +20864 2517.33 20266.67 2048 19072 2048 c +17962.67 2048 17408 2517.33 17408 3456 c +17408 19712 l +17408 21504 17664 24064 18176 27392 c +16554.67 22101.33 14592 17877.33 12288 14720 c +11861.33 14208 11349.33 13952 10752 13952 c +10410.67 13952 10112 14037.33 9856 14208 c +9344 14634.67 9088 15104 9088 15616 c +9088 16042.67 9216 16469.33 9472 16896 c +12800 20992 15232 25984 16768 31872 c +11520 31872 l +10581.33 31872 10112 32426.67 10112 33536 c +10112 34645.33 10581.33 35200 11520 35200 c +17408 35200 l +17408 41600 l +15786.67 41258.67 14250.67 41002.67 12800 40832 c +12800 40746.67 12714.67 40704 12544 40704 c +11605.33 40704 11050.67 41216 10880 42240 c +10880 42496 l +10880 43434.67 11306.67 43989.33 12160 44160 c +16853.33 44842.67 20693.33 45952 23680 47488 c +24021.33 47658.67 24405.33 47744 24832 47744 c +25429.33 47744 25941.33 47445.33 26368 46848 c +26624 46506.67 26752 46165.33 26752 45824 c +26752 45226.67 26410.67 44757.33 25728 44416 c +24533.33 43818.67 22912 43178.67 20864 42496 c +20864 35200 l +25472 35200 l +h +33792 36224 m +33792 37162.67 34432 37632 35712 37632 c +36906.67 37632 37504 37120 37504 36096 c +37504 19328 l +42197.33 25642.67 45738.67 33706.67 48128 43520 c +48298.67 44458.67 48853.33 44928 49792 44928 c +49962.67 44928 50133.33 44885.33 50304 44800 c +51413.33 44629.33 51968 44074.67 51968 43136 c +51968 42880 51925.33 42709.33 51840 42624 c +48597.33 30677.33 43818.67 21120 37504 13952 c +37504 9088 l +37504 7978.67 38016 7338.67 39040 7168 c +39893.33 7082.67 41045.33 7040 42496 7040 c +43776 7040 44906.67 7168 45888 7424 c +46869.33 7680 47488 8234.67 47744 9088 c +48085.33 10282.67 48298.67 11946.67 48384 14080 c +48384 15104 48981.33 15616 50176 15616 c +50304 15616 l +51413.33 15530.67 51968 14933.33 51968 13824 c +51968 13696 l +51797.33 10794.67 51456 8533.33 50944 6912 c +50346.67 5290.67 49066.67 4266.67 47104 3840 c +45994.67 3669.33 44458.67 3541.33 42496 3456 c +40618.67 3456 38997.33 3541.33 37632 3712 c +35072 4053.33 33792 5418.67 33792 7808 c +33792 11264 l +31317.33 8960 28672 6954.67 25856 5248 c +25429.33 4992 25002.67 4864 24576 4864 c +23893.33 4864 23424 5162.67 23168 5760 c +22912 6016 22784 6357.33 22784 6784 c +22784 7552 23125.33 8106.67 23808 8448 c +27306.67 10410.67 30634.67 13013.33 33792 16256 c +33792 36224 l +h +29696 30592 m +29781.33 30592 29866.67 30592 29952 30592 c +30976 30421.33 31488 29866.67 31488 28928 c +31488 28672 31488 28501.33 31488 28416 c +30976 23466.67 29952 19200 28416 15616 c +27989.33 14848 27392 14464 26624 14464 c +26368 14464 26112 14506.67 25856 14592 c +25258.67 14933.33 24960 15402.67 24960 16000 c +24960 16341.33 25045.33 16682.67 25216 17024 c +26666.67 20352 27648 24405.33 28160 29184 c +28245.33 30122.67 28757.33 30592 29696 30592 c +h +42624 41984 m +43221.33 41472 43520 40917.33 43520 40320 c +43520 39978.67 43434.67 39680 43264 39424 c +42837.33 38826.67 42282.67 38528 41600 38528 c +41088 38528 40661.33 38698.67 40320 39040 c +37845.33 41002.67 35157.33 42709.33 32256 44160 c +31658.67 44501.33 31360 44970.67 31360 45568 c +31360 45909.33 31445.33 46208 31616 46464 c +32042.67 47146.67 32640 47488 33408 47488 c +33664 47488 34005.33 47402.67 34432 47232 c +37674.67 45696 40405.33 43946.67 42624 41984 c +h +50816 29952 m +51498.67 29952 52053.33 29568 52480 28800 c +53930.67 25642.67 55082.67 22058.67 55936 18048 c +56021.33 17706.67 56064 17450.67 56064 17280 c +56064 16512 55637.33 15957.33 54784 15616 c +54442.67 15616 54229.33 15616 54144 15616 c +53290.67 15616 52736 16085.33 52480 17024 c +51456 21205.33 50346.67 24661.33 49152 27392 c +48981.33 27648 48896 27946.67 48896 28288 c +48896 28970.67 49237.33 29482.67 49920 29824 c +50176 29909.33 50474.67 29952 50816 29952 c +h +W n +1 1 1 rg +-32767 -32767 65534 65534 re f +Q +Q +endstream +endobj +xref +0 5 +0000000000 65535 f +0000000015 00000 n +0000000064 00000 n +0000000121 00000 n +0000000218 00000 n +trailer +<< /Size 5 /Root 1 0 R >> +startxref +4862 +%%EOF diff --git a/test/vector/data/expected/basic/colrv0-large-scale.svg b/test/vector/data/expected/basic/colrv0-large-scale.svg new file mode 100644 index 000000000..edd4b2fb4 --- /dev/null +++ b/test/vector/data/expected/basic/colrv0-large-scale.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/test/vector/data/tests/basic.tests b/test/vector/data/tests/basic.tests index 426e6a0ff..0c7c6eec9 100644 --- a/test/vector/data/tests/basic.tests +++ b/test/vector/data/tests/basic.tests @@ -14,3 +14,5 @@ ../../../fuzzing/fonts/noto_handwriting-cff_colr_1.otf;;U+270D;../expected/basic/handwriting-cff-colr-1.svg ../../../fuzzing/fonts/noto_handwriting-cff2_colr_1.otf;;U+270D;../expected/basic/handwriting-cff-colr-1.svg ../../../api/fonts/Roboto-Regular.abc.ttf;--font-size=65536;U+0061,U+0062,U+0063;../expected/basic/glyf-quadratics.pdf +../../../api/fonts/TwemojiMozilla.subset.default.32,3299.ttf;--font-size=65536;U+3299;../expected/basic/colrv0-large-scale.svg +../../../api/fonts/TwemojiMozilla.subset.default.32,3299.ttf;--font-size=65536;U+3299;../expected/basic/colrv0-large-scale.pdf From f7a8ef5022fa35500a0def38641b0f4d03ee9fe8 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 7 Jul 2026 16:01:50 +0300 Subject: [PATCH 059/112] [vector] Fix PDF MediaBox orientation The MediaBox negated the y-range like SVG viewBox does, but the SVG output is wrapped in scale(1,-1), and PDF content is emitted y-up. --- src/hb-vector-paint-pdf.cc | 6 +++--- test/vector/data/expected/basic/colrv0-large-scale.pdf | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hb-vector-paint-pdf.cc b/src/hb-vector-paint-pdf.cc index f28e1f866..8a9117ae5 100644 --- a/src/hb-vector-paint-pdf.cc +++ b/src/hb-vector-paint-pdf.cc @@ -1612,11 +1612,11 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint) out.append_str ("3 0 obj\n<< /Type /Page /Parent 2 0 R /MediaBox ["); out.append_num (ex); out.append_c (' '); - out.append_num (-(ey + eh)); + out.append_num (ey); out.append_c (' '); out.append_num (ex + ew); out.append_c (' '); - out.append_num (-ey); + out.append_num (ey + eh); out.append_str ("]\n/Contents 4 0 R"); /* Resources. */ @@ -1674,7 +1674,7 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint) bg_prefix.append_str (" rg\n"); bg_prefix.append_num (ex); bg_prefix.append_c (' '); - bg_prefix.append_num (-(ey + eh)); + bg_prefix.append_num (ey); bg_prefix.append_c (' '); bg_prefix.append_num (ew); bg_prefix.append_c (' '); diff --git a/test/vector/data/expected/basic/colrv0-large-scale.pdf b/test/vector/data/expected/basic/colrv0-large-scale.pdf index 79237fd92..17586c3e7 100644 --- a/test/vector/data/expected/basic/colrv0-large-scale.pdf +++ b/test/vector/data/expected/basic/colrv0-large-scale.pdf @@ -7,14 +7,14 @@ endobj << /Type /Pages /Kids [3 0 R] /Count 1 >> endobj 3 0 obj -<< /Type /Page /Parent 2 0 R /MediaBox [-16 -57360 65552 8208] +<< /Type /Page /Parent 2 0 R /MediaBox [-16 -8208 65552 57360] /Contents 4 0 R >> endobj 4 0 obj -<< /Length 4593 >> +<< /Length 4592 >> stream 1 1 1 rg --16 -57360 65568 65568 re f +-16 -8208 65568 65568 re f q 1 0 0 1 0 0 cm q @@ -161,5 +161,5 @@ xref trailer << /Size 5 /Root 1 0 R >> startxref -4862 +4861 %%EOF From 421cc8f5a726d60925b91c992a82885064332ec4 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 8 Jul 2026 12:20:57 +0300 Subject: [PATCH 060/112] [paint] Add hb_paint_fill_glyph() Instead of painting COLRv0 and outline fallback layers with push_clip_glyph + color + pop_clip, add a dedicated callback for this common paint operation. The default (*_nil) implementation uses the decomposed sequence, so existing clients without a fill_glyph implementation continue to work as before. --- docs/harfbuzz-sections.txt | 3 +++ src/OT/Color/COLR/COLR.hh | 4 +--- src/hb-font.cc | 4 +--- src/hb-paint.cc | 38 ++++++++++++++++++++++++++++++ src/hb-paint.h | 47 ++++++++++++++++++++++++++++++++++++++ src/hb-paint.hh | 10 ++++++++ 6 files changed, 100 insertions(+), 6 deletions(-) diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt index 95c179c2f..955e33b81 100644 --- a/docs/harfbuzz-sections.txt +++ b/docs/harfbuzz-sections.txt @@ -266,6 +266,8 @@ hb_paint_pop_transform_func_t hb_paint_funcs_set_pop_transform_func hb_paint_color_glyph_func_t hb_paint_funcs_set_color_glyph_func +hb_paint_fill_glyph_func_t +hb_paint_funcs_set_fill_glyph_func hb_paint_push_clip_glyph_func_t hb_paint_funcs_set_push_clip_glyph_func hb_paint_push_clip_rectangle_func_t @@ -311,6 +313,7 @@ hb_paint_push_font_transform hb_paint_push_inverse_font_transform hb_paint_pop_transform hb_paint_color_glyph +hb_paint_fill_glyph hb_paint_push_clip_glyph hb_paint_push_clip_rectangle hb_paint_push_clip_path_start diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index 39a8231ba..7db97299b 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -2761,9 +2761,7 @@ struct COLR { hb_bool_t is_foreground; hb_color_t color = c.get_color (r.colorIdx, 1., &is_foreground); - c.funcs->push_clip_glyph (c.data, r.glyphId, c.font); - c.funcs->color (c.data, is_foreground, color); - c.funcs->pop_clip (c.data); + c.funcs->fill_glyph (c.data, r.glyphId, c.font, is_foreground, color); } return true; diff --git a/src/hb-font.cc b/src/hb-font.cc index 96fcff501..4b7bce99f 100644 --- a/src/hb-font.cc +++ b/src/hb-font.cc @@ -1670,9 +1670,7 @@ hb_font_t::paint_glyph (hb_codepoint_t glyph, return; /* Fallback for outline glyph. */ - paint_funcs->push_clip_glyph (paint_data, glyph, this); - paint_funcs->color (paint_data, true, foreground); - paint_funcs->pop_clip (paint_data); + paint_funcs->fill_glyph (paint_data, glyph, this, true, foreground); } diff --git a/src/hb-paint.cc b/src/hb-paint.cc index e272ec39b..9e84fbbb9 100644 --- a/src/hb-paint.cc +++ b/src/hb-paint.cc @@ -60,6 +60,20 @@ hb_paint_color_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_font_t *font, void *user_data) { return false; } +static void +hb_paint_fill_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color, + void *user_data) +{ + /* Decompose into the equivalent general sequence. */ + funcs->push_clip_glyph (paint_data, glyph, font); + funcs->color (paint_data, is_foreground, color); + funcs->pop_clip (paint_data); +} + static void hb_paint_push_clip_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_codepoint_t glyph, @@ -551,6 +565,30 @@ hb_paint_color_glyph (hb_paint_funcs_t *funcs, void *paint_data, return funcs->color_glyph (paint_data, glyph, font); } +/** + * hb_paint_fill_glyph: + * @funcs: paint functions + * @paint_data: associated data passed by the caller + * @glyph: the glyph ID + * @font: the font + * @is_foreground: whether the color is the foreground + * @color: The color to use + * + * Perform a "fill-glyph" paint operation: fill the glyph's shape + * with a solid color. + * + * XSince: REPLACEME + */ +void +hb_paint_fill_glyph (hb_paint_funcs_t *funcs, void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color) +{ + funcs->fill_glyph (paint_data, glyph, font, is_foreground, color); +} + /** * hb_paint_push_clip_glyph: * @funcs: paint functions diff --git a/src/hb-paint.h b/src/hb-paint.h index 9057e3b72..46e83b817 100644 --- a/src/hb-paint.h +++ b/src/hb-paint.h @@ -157,6 +157,29 @@ typedef hb_bool_t (*hb_paint_color_glyph_func_t) (hb_paint_funcs_t *funcs, hb_font_t *font, void *user_data); +/** + * hb_paint_fill_glyph_func_t: + * @funcs: paint functions object + * @paint_data: The data accompanying the paint functions in hb_font_paint_glyph() + * @glyph: the glyph ID + * @font: the font + * @is_foreground: whether the color is the foreground + * @color: The color to use, unpremultiplied + * @user_data: User data pointer passed to hb_paint_funcs_set_fill_glyph_func() + * + * A virtual method for the #hb_paint_funcs_t to fill a glyph's + * shape with a solid color. + * + * XSince: REPLACEME + */ +typedef void (*hb_paint_fill_glyph_func_t) (hb_paint_funcs_t *funcs, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color, + void *user_data); + /** * hb_paint_push_clip_glyph_func_t: * @funcs: paint functions object @@ -854,6 +877,23 @@ hb_paint_funcs_set_color_glyph_func (hb_paint_funcs_t *funcs, void *user_data, hb_destroy_func_t destroy); +/** + * hb_paint_funcs_set_fill_glyph_func: + * @funcs: A paint functions struct + * @func: (closure user_data) (destroy destroy) (scope notified): The fill-glyph callback + * @user_data: Data to pass to @func + * @destroy: (nullable): Function to call when @user_data is no longer needed + * + * Sets the fill-glyph callback on the paint functions struct. + * + * XSince: REPLACEME + */ +HB_EXTERN void +hb_paint_funcs_set_fill_glyph_func (hb_paint_funcs_t *funcs, + hb_paint_fill_glyph_func_t func, + void *user_data, + hb_destroy_func_t destroy); + /** * hb_paint_funcs_set_push_clip_glyph_func: * @funcs: A paint functions struct @@ -1117,6 +1157,13 @@ hb_paint_color_glyph (hb_paint_funcs_t *funcs, void *paint_data, hb_codepoint_t glyph, hb_font_t *font); +HB_EXTERN void +hb_paint_fill_glyph (hb_paint_funcs_t *funcs, void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color); + HB_EXTERN void hb_paint_push_clip_glyph (hb_paint_funcs_t *funcs, void *paint_data, hb_codepoint_t glyph, diff --git a/src/hb-paint.hh b/src/hb-paint.hh index 148bfc974..f06bce45d 100644 --- a/src/hb-paint.hh +++ b/src/hb-paint.hh @@ -48,6 +48,7 @@ HB_PAINT_FUNC_IMPLEMENT (push_group_for) \ HB_PAINT_FUNC_IMPLEMENT (pop_group) \ HB_PAINT_FUNC_IMPLEMENT (custom_palette_color) \ + HB_PAINT_FUNC_IMPLEMENT (fill_glyph) \ /* ^--- Add new callbacks here */ struct hb_paint_funcs_t @@ -121,6 +122,15 @@ struct hb_paint_funcs_t { func.color (this, paint_data, is_foreground, color, !user_data ? nullptr : user_data->color); } + void fill_glyph (void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground, + hb_color_t color) + { func.fill_glyph (this, paint_data, + glyph, font, + is_foreground, color, + !user_data ? nullptr : user_data->fill_glyph); } bool image (void *paint_data, hb_blob_t *image, unsigned width, unsigned height, From 9ab56e867898d22cc307e17e0335aa8968691edc Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 8 Jul 2026 12:24:16 +0300 Subject: [PATCH 061/112] [vector] Implement fill_glyph callback Fill the glyph shape directly. This simplifies the SVG/PDF output and fixes the SVG clipping issue with COLRv0 layers and large scale, as there is no clip now at all. --- src/hb-vector-paint-pdf.cc | 53 +++++++++++++++++++ src/hb-vector-paint-svg.cc | 28 ++++++++++ .../expected/basic/colrv0-large-scale.pdf | 18 +++---- .../expected/basic/colrv0-large-scale.svg | 14 +---- 4 files changed, 89 insertions(+), 24 deletions(-) diff --git a/src/hb-vector-paint-pdf.cc b/src/hb-vector-paint-pdf.cc index 8a9117ae5..a9f365777 100644 --- a/src/hb-vector-paint-pdf.cc +++ b/src/hb-vector-paint-pdf.cc @@ -392,6 +392,58 @@ hb_pdf_paint_pop_transform (hb_paint_funcs_t *, paint->current_body ().append_str ("Q\n"); } +static void +hb_pdf_paint_fill_glyph (hb_paint_funcs_t *, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t, + hb_color_t c, + void *) +{ + auto *paint = (hb_vector_paint_t *) paint_data; + if (unlikely (!paint->ensure_initialized ())) + return; + + float r = hb_color_get_red (c) / 255.f; + float g = hb_color_get_green (c) / 255.f; + float b = hb_color_get_blue (c) / 255.f; + float a = hb_color_get_alpha (c) / 255.f; + + if (a < 1.f / 255.f) + return; + + auto &body = paint->current_body (); + + bool scoped = false; + /* Set alpha via ExtGState if needed, scoped so it does not leak + * into later paints. */ + if (a < 1.f - 1.f / 512.f) + { + auto *res = hb_pdf_get_resources (paint); + if (res) + { + unsigned gs_idx = res->add_extgstate_alpha (a); + body.append_str ("q\n"); + scoped = true; + body.append_str ("/GS"); + body.append_unsigned (gs_idx); + body.append_str (" gs\n"); + } + } + + body.append_num (r, 4); + body.append_c (' '); + body.append_num (g, 4); + body.append_c (' '); + body.append_num (b, 4); + body.append_str (" rg\n"); + hb_pdf_emit_glyph_path (paint, font, glyph, &body); + body.append_str ("f\n"); + if (scoped) + body.append_str ("Q\n"); +} + static void hb_pdf_paint_push_clip_glyph (hb_paint_funcs_t *, void *paint_data, @@ -1534,6 +1586,7 @@ static struct hb_pdf_paint_funcs_lazy_loader_t hb_paint_funcs_t *funcs = hb_paint_funcs_create (); hb_paint_funcs_set_push_transform_func (funcs, (hb_paint_push_transform_func_t) hb_pdf_paint_push_transform, nullptr, nullptr); hb_paint_funcs_set_pop_transform_func (funcs, (hb_paint_pop_transform_func_t) hb_pdf_paint_pop_transform, nullptr, nullptr); + hb_paint_funcs_set_fill_glyph_func (funcs, (hb_paint_fill_glyph_func_t) hb_pdf_paint_fill_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_glyph_func (funcs, (hb_paint_push_clip_glyph_func_t) hb_pdf_paint_push_clip_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_rectangle_func (funcs, (hb_paint_push_clip_rectangle_func_t) hb_pdf_paint_push_clip_rectangle, nullptr, nullptr); hb_paint_funcs_set_push_clip_path_start_func (funcs, (hb_paint_push_clip_path_start_func_t) hb_pdf_paint_push_clip_path_start, nullptr, nullptr); diff --git a/src/hb-vector-paint-svg.cc b/src/hb-vector-paint-svg.cc index eca53e39a..7cca077bb 100644 --- a/src/hb-vector-paint-svg.cc +++ b/src/hb-vector-paint-svg.cc @@ -268,6 +268,7 @@ static void hb_vector_paint_push_transform (hb_paint_funcs_t *, void *, float, float, float, float, float, float, void *); static void hb_vector_paint_pop_transform (hb_paint_funcs_t *, void *, void *); +static void hb_vector_paint_fill_glyph (hb_paint_funcs_t *, void *, hb_codepoint_t, hb_font_t *, hb_bool_t, hb_color_t, void *); static void hb_vector_paint_push_clip_glyph (hb_paint_funcs_t *, void *, hb_codepoint_t, hb_font_t *, void *); static void hb_vector_paint_push_clip_rectangle (hb_paint_funcs_t *, void *, float, float, float, float, void *); static hb_draw_funcs_t * hb_vector_paint_push_clip_path_start (hb_paint_funcs_t *, void *, void **, void *); @@ -308,6 +309,7 @@ static struct hb_vector_paint_funcs_lazy_loader_t hb_paint_funcs_t *funcs = hb_paint_funcs_create (); hb_paint_funcs_set_push_transform_func (funcs, (hb_paint_push_transform_func_t) hb_vector_paint_push_transform, nullptr, nullptr); hb_paint_funcs_set_pop_transform_func (funcs, (hb_paint_pop_transform_func_t) hb_vector_paint_pop_transform, nullptr, nullptr); + hb_paint_funcs_set_fill_glyph_func (funcs, (hb_paint_fill_glyph_func_t) hb_vector_paint_fill_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_glyph_func (funcs, (hb_paint_push_clip_glyph_func_t) hb_vector_paint_push_clip_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_rectangle_func (funcs, (hb_paint_push_clip_rectangle_func_t) hb_vector_paint_push_clip_rectangle, nullptr, nullptr); hb_paint_funcs_set_push_clip_path_start_func (funcs, (hb_paint_push_clip_path_start_func_t) hb_vector_paint_push_clip_path_start, nullptr, nullptr); @@ -413,6 +415,32 @@ hb_vector_paint_pop_transform (hb_paint_funcs_t *, paint->current_body ().append_str ("\n"); } +static void +hb_vector_paint_fill_glyph (hb_paint_funcs_t *, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t, + hb_color_t color, + void *) +{ + auto *paint = (hb_vector_paint_t *) paint_data; + if (unlikely (!paint->ensure_initialized ())) + return; + + paint->path.clear (); + hb_vector_path_sink_t sink = {&paint->path, paint->get_precision (), + paint->x_scale_factor, paint->y_scale_factor}; + hb_font_draw_glyph (font, glyph, hb_vector_svg_path_draw_funcs_get (), &sink); + + auto &body = paint->current_body (); + body.append_str ("path.arrayZ, paint->path.length); + body.append_str ("\" fill=\""); + body.append_svg_color (color, true); + body.append_str ("\"/>\n"); +} + static void hb_vector_paint_push_clip_glyph (hb_paint_funcs_t *, void *paint_data, diff --git a/test/vector/data/expected/basic/colrv0-large-scale.pdf b/test/vector/data/expected/basic/colrv0-large-scale.pdf index 17586c3e7..54074f06a 100644 --- a/test/vector/data/expected/basic/colrv0-large-scale.pdf +++ b/test/vector/data/expected/basic/colrv0-large-scale.pdf @@ -11,13 +11,13 @@ endobj /Contents 4 0 R >> endobj 4 0 obj -<< /Length 4592 >> +<< /Length 4518 >> stream 1 1 1 rg -16 -8208 65568 65568 re f q 1 0 0 1 0 0 cm -q +0.8667 0.1804 0.2667 rg 55936 47744 m 62336 41344 65536 33621.33 65536 24576 c 65536 15530.67 62336 7808 55936 1408 c @@ -28,11 +28,8 @@ q 16000 54144 23722.67 57344 32768 57344 c 41813.33 57344 49536 54144 55936 47744 c h -W n -0.8667 0.1804 0.2667 rg --32767 -32767 65534 65534 re f -Q -q +f +1 1 1 rg 25472 35200 m 26410.67 35200 26880 34645.33 26880 33536 c 26880 32426.67 26410.67 31872 25472 31872 c @@ -144,10 +141,7 @@ h 48896 28970.67 49237.33 29482.67 49920 29824 c 50176 29909.33 50474.67 29952 50816 29952 c h -W n -1 1 1 rg --32767 -32767 65534 65534 re f -Q +f Q endstream endobj @@ -161,5 +155,5 @@ xref trailer << /Size 5 /Root 1 0 R >> startxref -4861 +4787 %%EOF diff --git a/test/vector/data/expected/basic/colrv0-large-scale.svg b/test/vector/data/expected/basic/colrv0-large-scale.svg index edd4b2fb4..bd76c65d3 100644 --- a/test/vector/data/expected/basic/colrv0-large-scale.svg +++ b/test/vector/data/expected/basic/colrv0-large-scale.svg @@ -1,17 +1,7 @@ - - - - - - - - - - - - + + From b011381764f87be3cdd57b9a3205a51064016bba Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 9 Jul 2026 12:09:01 -0600 Subject: [PATCH 062/112] Ignore -Wunused-template Fixes https://github.com/harfbuzz/harfbuzz/issues/6059 --- src/hb.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hb.hh b/src/hb.hh index 7e2837f99..2458c1b3a 100644 --- a/src/hb.hh +++ b/src/hb.hh @@ -92,6 +92,7 @@ #pragma GCC diagnostic error "-Wunneeded-internal-declaration" #pragma GCC diagnostic error "-Wunused" #pragma GCC diagnostic error "-Wunused-local-typedefs" +#pragma GCC diagnostic error "-Wunused-template" #pragma GCC diagnostic error "-Wunused-value" #pragma GCC diagnostic error "-Wunused-variable" #pragma GCC diagnostic error "-Wvla" From 5e887d36722abfef1c02a11ab15a369d7745027e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 9 Jul 2026 12:14:33 -0600 Subject: [PATCH 063/112] Fix previous commit --- src/hb.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb.hh b/src/hb.hh index 2458c1b3a..5d7c45c79 100644 --- a/src/hb.hh +++ b/src/hb.hh @@ -92,7 +92,6 @@ #pragma GCC diagnostic error "-Wunneeded-internal-declaration" #pragma GCC diagnostic error "-Wunused" #pragma GCC diagnostic error "-Wunused-local-typedefs" -#pragma GCC diagnostic error "-Wunused-template" #pragma GCC diagnostic error "-Wunused-value" #pragma GCC diagnostic error "-Wunused-variable" #pragma GCC diagnostic error "-Wvla" @@ -152,6 +151,7 @@ #pragma GCC diagnostic ignored "-Wrange-loop-analysis" // https://github.com/harfbuzz/harfbuzz/issues/2834 #pragma GCC diagnostic ignored "-Wstrict-aliasing" #pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wunused-template" #pragma GCC diagnostic ignored "-Wc++11-compat" // only gcc raises it #endif From 907579859f604633ad511f2f49fa0299d799d9b8 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 10 Jul 2026 01:59:59 -0600 Subject: [PATCH 064/112] [gobject] Drop const attribute from enum get_type declarations (#6061) GLib removed G_GNUC_CONST from generated get_type declarations because GType registration can initialize state and the attribute can cause miscompilations with GCC trunk. Match that behavior for generated GObject enum declarations. Fixes: https://github.com/harfbuzz/harfbuzz/issues/6060 Assisted-by: OpenAI Codex --- src/hb-gobject-enums.h.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-gobject-enums.h.tmpl b/src/hb-gobject-enums.h.tmpl index 6dd98f7fe..3f491d9b3 100644 --- a/src/hb-gobject-enums.h.tmpl +++ b/src/hb-gobject-enums.h.tmpl @@ -43,7 +43,7 @@ HB_BEGIN_DECLS /*** BEGIN value-header ***/ HB_EXTERN GType -@enum_name@_get_type (void) G_GNUC_CONST; +@enum_name@_get_type (void); #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) /*** END value-header ***/ From afda4215dd9c88a1d1a0f8d4ec0092f3ad5c4059 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 12 Jul 2026 03:26:26 +0300 Subject: [PATCH 065/112] [ft] Use fill_glyph for COLRv0 layers --- src/hb-ft-colr.hh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hb-ft-colr.hh b/src/hb-ft-colr.hh index af45ca754..5237dfb5d 100644 --- a/src/hb-ft-colr.hh +++ b/src/hb-ft-colr.hh @@ -600,10 +600,8 @@ hb_ft_paint_glyph_colr (hb_font_t *font, } ft_font->lock.unlock (); - paint_funcs->push_clip_glyph (paint_data, layer_glyph_index, font); + paint_funcs->fill_glyph (paint_data, layer_glyph_index, font, is_foreground, color); ft_font->lock.lock (); - paint_funcs->color (paint_data, is_foreground, color); - paint_funcs->pop_clip (paint_data); } while (FT_Get_Color_Glyph_Layer(ft_face, gid, From bec75aa8810651a6b197137002f170654408dddc Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 12 Jul 2026 15:13:24 +0300 Subject: [PATCH 066/112] [cairo] Implement fill_glyph callback --- src/hb-cairo-utils.cc | 26 +++++++++++++++++++++++ src/hb-cairo-utils.hh | 5 +++++ src/hb-cairo.cc | 49 ++++++++++++++++++++++++------------------- 3 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/hb-cairo-utils.cc b/src/hb-cairo-utils.cc index d0888d4c5..0912cd082 100644 --- a/src/hb-cairo-utils.cc +++ b/src/hb-cairo-utils.cc @@ -94,6 +94,32 @@ _hb_cairo_destroy_blob (void *p) hb_blob_destroy ((hb_blob_t *) p); } +void +_hb_cairo_set_source_color (hb_cairo_context_t *c, + hb_bool_t use_foreground, + hb_color_t color) +{ + cairo_t *cr = c->cr; + + if (use_foreground) + { +#ifdef HAVE_CAIRO_USER_SCALED_FONT_GET_FOREGROUND_SOURCE + double r, g, b, a; + cairo_pattern_t *foreground = cairo_user_scaled_font_get_foreground_source (c->scaled_font); + if (cairo_pattern_get_rgba (foreground, &r, &g, &b, &a) == CAIRO_STATUS_SUCCESS) + cairo_set_source_rgba (cr, r, g, b, a * hb_color_get_alpha (color) / 255.); + else +#endif + cairo_set_source_rgba (cr, 0, 0, 0, hb_color_get_alpha (color) / 255.); + } + else + cairo_set_source_rgba (cr, + hb_color_get_red (color) / 255., + hb_color_get_green (color) / 255., + hb_color_get_blue (color) / 255., + hb_color_get_alpha (color) / 255.); +} + hb_bool_t _hb_cairo_paint_glyph_image (hb_cairo_context_t *c, hb_blob_t *blob, diff --git a/src/hb-cairo-utils.hh b/src/hb-cairo-utils.hh index a26bf59d9..c9e380120 100644 --- a/src/hb-cairo-utils.hh +++ b/src/hb-cairo-utils.hh @@ -75,6 +75,11 @@ _hb_paint_composite_mode_to_cairo (hb_paint_composite_mode_t mode) } } +HB_INTERNAL void +_hb_cairo_set_source_color (hb_cairo_context_t *c, + hb_bool_t use_foreground, + hb_color_t color); + HB_INTERNAL hb_bool_t _hb_cairo_paint_glyph_image (hb_cairo_context_t *c, hb_blob_t *blob, diff --git a/src/hb-cairo.cc b/src/hb-cairo.cc index ddb5d23dc..add26bea7 100644 --- a/src/hb-cairo.cc +++ b/src/hb-cairo.cc @@ -166,6 +166,29 @@ hb_cairo_pop_transform (hb_paint_funcs_t *pfuncs HB_UNUSED, cairo_restore (cr); } +static void +hb_cairo_fill_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t use_foreground, + hb_color_t color, + void *user_data HB_UNUSED) +{ + hb_cairo_context_t *c = (hb_cairo_context_t *) paint_data; + cairo_t *cr = c->cr; + + cairo_save (cr); + + cairo_new_path (cr); + hb_font_draw_glyph (font, glyph, hb_cairo_draw_get_funcs (), cr); + cairo_close_path (cr); + _hb_cairo_set_source_color (c, use_foreground, color); + cairo_fill (cr); + + cairo_restore (cr); +} + static hb_bool_t hb_cairo_paint_color_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED, void *paint_data, @@ -303,23 +326,7 @@ hb_cairo_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED, hb_cairo_context_t *c = (hb_cairo_context_t *) paint_data; cairo_t *cr = c->cr; - if (use_foreground) - { -#ifdef HAVE_CAIRO_USER_SCALED_FONT_GET_FOREGROUND_SOURCE - double r, g, b, a; - cairo_pattern_t *foreground = cairo_user_scaled_font_get_foreground_source (c->scaled_font); - if (cairo_pattern_get_rgba (foreground, &r, &g, &b, &a) == CAIRO_STATUS_SUCCESS) - cairo_set_source_rgba (cr, r, g, b, a * hb_color_get_alpha (color) / 255.); - else -#endif - cairo_set_source_rgba (cr, 0, 0, 0, hb_color_get_alpha (color) / 255.); - } - else - cairo_set_source_rgba (cr, - hb_color_get_red (color) / 255., - hb_color_get_green (color) / 255., - hb_color_get_blue (color) / 255., - hb_color_get_alpha (color) / 255.); + _hb_cairo_set_source_color (c, use_foreground, color); cairo_paint (cr); } @@ -452,6 +459,7 @@ static struct hb_cairo_paint_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t< hb_paint_funcs_set_push_transform_func (funcs, hb_cairo_push_transform, nullptr, nullptr); hb_paint_funcs_set_pop_transform_func (funcs, hb_cairo_pop_transform, nullptr, nullptr); + hb_paint_funcs_set_fill_glyph_func (funcs, hb_cairo_fill_glyph, nullptr, nullptr); hb_paint_funcs_set_color_glyph_func (funcs, hb_cairo_paint_color_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_glyph_func (funcs, hb_cairo_push_clip_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_rectangle_func (funcs, hb_cairo_push_clip_rectangle, nullptr, nullptr); @@ -675,10 +683,9 @@ hb_cairo_render_color_glyph (cairo_scaled_font_t *scaled_font, c.color_cache = (hb_map_t *) cairo_scaled_font_get_user_data (scaled_font, &color_cache_key); /* Synthesizing variant: mono glyphs render here too via the - * push_clip_glyph + foreground-fill fallback inside - * hb_font_paint_glyph. Callers that want the cheaper - * outline path for mono fonts set CAIRO_COLOR_MODE_NO_COLOR - * on the font options instead. */ + * fill_glyph foreground fallback inside hb_font_paint_glyph. + * Callers that want the cheaper outline path for mono fonts set + * CAIRO_COLOR_MODE_NO_COLOR on the font options instead. */ hb_font_paint_glyph (font, glyph, hb_cairo_paint_get_funcs (), &c, palette, color); return CAIRO_STATUS_SUCCESS; From 884a591273ca367ed9a029951225cd9d2e8980c9 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 12 Jul 2026 19:21:47 +0300 Subject: [PATCH 067/112] [raster] Implement fill_glyph callback --- src/hb-raster-paint.cc | 155 +++++++++++++++++++++++++++++++++-------- 1 file changed, 125 insertions(+), 30 deletions(-) diff --git a/src/hb-raster-paint.cc b/src/hb-raster-paint.cc index 24e3973f2..46ea2889a 100644 --- a/src/hb-raster-paint.cc +++ b/src/hb-raster-paint.cc @@ -196,6 +196,35 @@ hb_raster_paint_push_empty_clip (hb_raster_paint_t *c, unsigned w, unsigned h) (void) c->clip_stack.push (std::move (new_clip)); } +static bool +hb_raster_paint_intersect_mask (const hb_raster_image_t *surf, + const hb_raster_extents_t &mask_ext, + const hb_raster_clip_t &clip, + unsigned w, unsigned h, + int64_t *mask_x0, int64_t *mask_y0, + unsigned *ix0, unsigned *iy0, + unsigned *ix1, unsigned *iy1) +{ + /* Convert mask extents from surface coordinates to clip-buffer coordinates. */ + int64_t mx0 = (int64_t) mask_ext.x_origin - (int64_t) surf->extents.x_origin; + int64_t my0 = (int64_t) mask_ext.y_origin - (int64_t) surf->extents.y_origin; + + int64_t x0 = hb_max ((int64_t) clip.min_x, hb_max (mx0, (int64_t) 0)); + int64_t y0 = hb_max ((int64_t) clip.min_y, hb_max (my0, (int64_t) 0)); + int64_t x1 = hb_min ((int64_t) clip.max_x, hb_min (mx0 + mask_ext.width, (int64_t) w)); + int64_t y1 = hb_min ((int64_t) clip.max_y, hb_min (my0 + mask_ext.height, (int64_t) h)); + + if (x0 >= x1 || y0 >= y1) return false; + + *mask_x0 = mx0; + *mask_y0 = my0; + *ix0 = (unsigned) x0; + *iy0 = (unsigned) y0; + *ix1 = (unsigned) x1; + *iy1 = (unsigned) y1; + return true; +} + /* Render whatever edges have been accumulated into @rdr and * push the result as a new clip on the stack, intersecting * with the existing clip. Used by the emitter-based clip @@ -239,29 +268,17 @@ hb_raster_paint_finalize_path_clip (hb_raster_paint_t *c, return; } - /* Convert mask extents from surface coordinates to clip-buffer coordinates. */ - int64_t mask_x0 = (int64_t) mask_ext.x_origin - (int64_t) surf->extents.x_origin; - int64_t mask_y0 = (int64_t) mask_ext.y_origin - (int64_t) surf->extents.y_origin; - int64_t mask_x1 = mask_x0 + mask_ext.width; - int64_t mask_y1 = mask_y0 + mask_ext.height; - - int64_t ix0_i = hb_max ((int64_t) old_clip.min_x, hb_max (mask_x0, (int64_t) 0)); - int64_t iy0_i = hb_max ((int64_t) old_clip.min_y, hb_max (mask_y0, (int64_t) 0)); - int64_t ix1_i = hb_min ((int64_t) old_clip.max_x, hb_min (mask_x1, (int64_t) w)); - int64_t iy1_i = hb_min ((int64_t) old_clip.max_y, hb_min (mask_y1, (int64_t) h)); - - if (ix0_i >= ix1_i || iy0_i >= iy1_i) + int64_t mask_x0, mask_y0; + unsigned ix0, iy0, ix1, iy1; + if (!hb_raster_paint_intersect_mask (surf, mask_ext, old_clip, w, h, + &mask_x0, &mask_y0, + &ix0, &iy0, &ix1, &iy1)) { hb_raster_draw_recycle_image (rdr, mask_img); hb_raster_paint_push_empty_clip (c, w, h); return; } - unsigned ix0 = (unsigned) ix0_i; - unsigned iy0 = (unsigned) iy0_i; - unsigned ix1 = (unsigned) ix1_i; - unsigned iy1 = (unsigned) iy1_i; - new_clip.min_x = w; new_clip.min_y = h; new_clip.max_x = 0; new_clip.max_y = 0; @@ -697,19 +714,11 @@ hb_raster_paint_pop_group (hb_paint_funcs_t *pfuncs HB_UNUSED, } static void -hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED, - void *paint_data, - hb_bool_t is_foreground HB_UNUSED, +hb_raster_paint_solid (hb_raster_paint_t *c, + hb_raster_image_t *surf, hb_color_t color, - void *user_data HB_UNUSED) + hb_raster_image_t *mask_img) { - hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data; - - ensure_initialized (c); - - hb_raster_image_t *surf = c->current_surface (); - if (unlikely (!surf)) return; - uint32_t premul = color_to_premul_pixel (color); uint8_t premul_a = (uint8_t) (premul >> 24); const hb_raster_clip_t &clip = c->current_clip (); @@ -718,15 +727,36 @@ hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED, if (clip.min_x >= clip.max_x || clip.min_y >= clip.max_y) return; if (premul_a == 0) return; + unsigned ix0 = clip.min_x, iy0 = clip.min_y; + unsigned ix1 = clip.max_x, iy1 = clip.max_y; + const uint8_t *mask_buf = nullptr; + hb_raster_extents_t mask_ext; + int64_t mask_x0 = 0, mask_y0 = 0; + if (mask_img) + { + mask_buf = hb_raster_image_get_buffer (mask_img); + hb_raster_image_get_extents (mask_img, &mask_ext); + if (!hb_raster_paint_intersect_mask (surf, mask_ext, clip, + surf->extents.width, surf->extents.height, + &mask_x0, &mask_y0, + &ix0, &iy0, &ix1, &iy1)) + return; + } + if (likely (!clip.is_rect)) { - for (unsigned y = clip.min_y; y < clip.max_y; y++) + for (unsigned y = iy0; y < iy1; y++) { hb_packed_t *__restrict row = (hb_packed_t *) (surf->buffer.arrayZ + y * stride); const uint8_t *__restrict clip_row = clip.alpha.arrayZ + y * clip.stride; - for (unsigned x = clip.min_x; x < clip.max_x; x++) + const uint8_t *__restrict mask_row = mask_buf ? mask_buf + (unsigned) ((int64_t) y - mask_y0) * mask_ext.stride + : nullptr; + unsigned mx = (unsigned) ((int64_t) ix0 - mask_x0); + for (unsigned x = ix0; x < ix1; x++) { uint8_t clip_alpha = clip_row[x]; + if (mask_row) + clip_alpha = hb_raster_div255 (mask_row[mx++] * clip_alpha); if (clip_alpha == 0) continue; if (clip_alpha == 255) { @@ -743,6 +773,22 @@ hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED, } } } + else if (mask_buf) + { + for (unsigned y = iy0; y < iy1; y++) + { + hb_packed_t *__restrict row = (hb_packed_t *) (surf->buffer.arrayZ + y * stride); + const uint8_t *__restrict mask_row = mask_buf + (unsigned) ((int64_t) y - mask_y0) * mask_ext.stride; + unsigned mx = (unsigned) ((int64_t) ix0 - mask_x0); + for (unsigned x = ix0; x < ix1; x++) + { + uint8_t mask_alpha = mask_row[mx++]; + if (mask_alpha == 0) continue; + uint32_t src = hb_raster_alpha_mul (premul, mask_alpha); + row[x] = hb_packed_t (hb_raster_src_over (src, (uint32_t) row[x])); + } + } + } else { for (unsigned y = clip.min_y; y < clip.max_y; y++) @@ -754,6 +800,54 @@ hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED, } } +static void +hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED, + void *paint_data, + hb_bool_t is_foreground HB_UNUSED, + hb_color_t color, + void *user_data HB_UNUSED) +{ + hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data; + + ensure_initialized (c); + + hb_raster_image_t *surf = c->current_surface (); + if (unlikely (!surf)) return; + + hb_raster_paint_solid (c, surf, color, nullptr); +} + +static void +hb_raster_paint_fill_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font, + hb_bool_t is_foreground HB_UNUSED, + hb_color_t color, + void *user_data HB_UNUSED) +{ + hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data; + + ensure_initialized (c); + + hb_raster_image_t *surf = c->current_surface (); + if (unlikely (!surf)) return; + + hb_raster_draw_t *rdr = c->clip_rdr; + hb_transform_t<> t = c->current_effective_transform (); + hb_raster_draw_set_transform (rdr, t.xx, t.yx, t.xy, t.yy, t.x0, t.y0); + + hb_raster_paint_glyph_clip_data_t data = {glyph, font}; + hb_raster_paint_emit_clip_glyph_mask (rdr, &data); + + hb_raster_image_t *mask_img = hb_raster_draw_render (rdr); + if (unlikely (!mask_img)) return; + + hb_raster_paint_solid (c, surf, color, mask_img); + + hb_raster_draw_recycle_image (rdr, mask_img); +} + static hb_bool_t hb_raster_paint_image (hb_paint_funcs_t *pfuncs HB_UNUSED, void *paint_data, @@ -1645,6 +1739,7 @@ static struct hb_raster_paint_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t hb_paint_funcs_set_push_transform_func (funcs, hb_raster_paint_push_transform, nullptr, nullptr); hb_paint_funcs_set_pop_transform_func (funcs, hb_raster_paint_pop_transform, nullptr, nullptr); + hb_paint_funcs_set_fill_glyph_func (funcs, hb_raster_paint_fill_glyph, nullptr, nullptr); hb_paint_funcs_set_color_glyph_func (funcs, hb_raster_paint_color_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_glyph_func (funcs, hb_raster_paint_push_clip_glyph, nullptr, nullptr); hb_paint_funcs_set_push_clip_rectangle_func (funcs, hb_raster_paint_push_clip_rectangle, nullptr, nullptr); From b4ed9681838741bda1a5c05c383eac74340f0369 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 12 Jul 2026 19:36:15 +0300 Subject: [PATCH 068/112] [test/paint] Test the fill_path callback --- test/api/results-paint/rocher-1 | 16 +++-------- test/api/results-paint/rocher-2 | 16 +++-------- test/api/results-paint/rocher-3 | 16 +++-------- test/api/results-paint/test-165 | 4 +-- test/api/results-paint/test-175 | 4 +-- test/api/results-paint/test-6 | 4 +-- test/api/results-paint/testvf-165 | 4 +-- test/api/results-paint/testvf-175 | 4 +-- test/api/results-paint/testvf-6 | 4 +-- test/api/test-paint.c | 48 +++++++++++++++++++++++++++++++ 10 files changed, 66 insertions(+), 54 deletions(-) diff --git a/test/api/results-paint/rocher-1 b/test/api/results-paint/rocher-1 index bede5acbd..3f5925668 100644 --- a/test/api/results-paint/rocher-1 +++ b/test/api/results-paint/rocher-1 @@ -1,14 +1,6 @@ start transform 1 0 0.3 1 0 0 - start clip glyph 8 - solid 81 61 50 255 - end clip - start clip glyph 9 - solid 245 185 68 255 - end clip - start clip glyph 10 - solid 224 142 55 255 - end clip - start clip glyph 11 - solid 245 202 86 255 - end clip + fill glyph 8 solid 81 61 50 255 + fill glyph 9 solid 245 185 68 255 + fill glyph 10 solid 224 142 55 255 + fill glyph 11 solid 245 202 86 255 end transform diff --git a/test/api/results-paint/rocher-2 b/test/api/results-paint/rocher-2 index 4cb377293..8558dfd26 100644 --- a/test/api/results-paint/rocher-2 +++ b/test/api/results-paint/rocher-2 @@ -1,14 +1,6 @@ start transform 1 0 0.3 1 0 0 - start clip glyph 12 - solid 81 61 50 255 - end clip - start clip glyph 13 - solid 245 185 68 255 - end clip - start clip glyph 14 - solid 224 142 55 255 - end clip - start clip glyph 15 - solid 245 202 86 255 - end clip + fill glyph 12 solid 81 61 50 255 + fill glyph 13 solid 245 185 68 255 + fill glyph 14 solid 224 142 55 255 + fill glyph 15 solid 245 202 86 255 end transform diff --git a/test/api/results-paint/rocher-3 b/test/api/results-paint/rocher-3 index 326fdc4f9..08072ede7 100644 --- a/test/api/results-paint/rocher-3 +++ b/test/api/results-paint/rocher-3 @@ -1,12 +1,4 @@ -start clip glyph 16 - solid 81 61 50 255 -end clip -start clip glyph 17 - solid 245 185 68 255 -end clip -start clip glyph 18 - solid 224 142 55 255 -end clip -start clip glyph 19 - solid 245 202 86 255 -end clip +fill glyph 16 solid 81 61 50 255 +fill glyph 17 solid 245 185 68 255 +fill glyph 18 solid 224 142 55 255 +fill glyph 19 solid 245 202 86 255 diff --git a/test/api/results-paint/test-165 b/test/api/results-paint/test-165 index dd59b78c5..0172bbad0 100644 --- a/test/api/results-paint/test-165 +++ b/test/api/results-paint/test-165 @@ -1,3 +1 @@ -start clip glyph 165 - solid 0 0 0 255 -end clip +fill glyph 165 solid 0 0 0 255 diff --git a/test/api/results-paint/test-175 b/test/api/results-paint/test-175 index 77ca1eead..d6f868eaf 100644 --- a/test/api/results-paint/test-175 +++ b/test/api/results-paint/test-175 @@ -1,3 +1 @@ -start clip glyph 175 - solid 0 0 0 255 -end clip +fill glyph 175 solid 0 0 0 255 diff --git a/test/api/results-paint/test-6 b/test/api/results-paint/test-6 index ad5897b56..1ac702954 100644 --- a/test/api/results-paint/test-6 +++ b/test/api/results-paint/test-6 @@ -1,3 +1 @@ -start clip glyph 6 - solid 0 0 0 255 -end clip +fill glyph 6 solid 0 0 0 255 diff --git a/test/api/results-paint/testvf-165 b/test/api/results-paint/testvf-165 index dd59b78c5..0172bbad0 100644 --- a/test/api/results-paint/testvf-165 +++ b/test/api/results-paint/testvf-165 @@ -1,3 +1 @@ -start clip glyph 165 - solid 0 0 0 255 -end clip +fill glyph 165 solid 0 0 0 255 diff --git a/test/api/results-paint/testvf-175 b/test/api/results-paint/testvf-175 index 77ca1eead..d6f868eaf 100644 --- a/test/api/results-paint/testvf-175 +++ b/test/api/results-paint/testvf-175 @@ -1,3 +1 @@ -start clip glyph 175 - solid 0 0 0 255 -end clip +fill glyph 175 solid 0 0 0 255 diff --git a/test/api/results-paint/testvf-6 b/test/api/results-paint/testvf-6 index ad5897b56..1ac702954 100644 --- a/test/api/results-paint/testvf-6 +++ b/test/api/results-paint/testvf-6 @@ -1,3 +1 @@ -start clip glyph 6 - solid 0 0 0 255 -end clip +fill glyph 6 solid 0 0 0 255 diff --git a/test/api/test-paint.c b/test/api/test-paint.c index f12ca426d..e63e26389 100644 --- a/test/api/test-paint.c +++ b/test/api/test-paint.c @@ -111,6 +111,24 @@ pop_transform (hb_paint_funcs_t *funcs HB_UNUSED, print (data, "end transform"); } +static void +fill_glyph (hb_paint_funcs_t *funcs HB_UNUSED, + void *paint_data, + hb_codepoint_t glyph, + hb_font_t *font HB_UNUSED, + hb_bool_t use_foreground HB_UNUSED, + hb_color_t color, + void *user_data HB_UNUSED) +{ + paint_data_t *data = paint_data; + + print (data, "fill glyph %u solid %d %d %d %d", glyph, + hb_color_get_red (color), + hb_color_get_green (color), + hb_color_get_blue (color), + hb_color_get_alpha (color)); +} + static hb_bool_t paint_color_glyph (hb_paint_funcs_t *funcs HB_UNUSED, void *paint_data, @@ -341,6 +359,7 @@ get_test_paint_funcs (void) hb_paint_funcs_set_push_transform_func (funcs, push_transform, NULL, NULL); hb_paint_funcs_set_pop_transform_func (funcs, pop_transform, NULL, NULL); + hb_paint_funcs_set_fill_glyph_func (funcs, fill_glyph, NULL, NULL); hb_paint_funcs_set_color_glyph_func (funcs, paint_color_glyph, NULL, NULL); hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, NULL, NULL); hb_paint_funcs_set_push_clip_rectangle_func (funcs, push_clip_rectangle, NULL, NULL); @@ -828,6 +847,34 @@ test_push_clip_path_round_trip (void) hb_draw_funcs_destroy (sink); } +/* Test the default implementation of fill_glyph does the + * push_clip_glyph + color + pop_clip sequence. */ +static void +test_fill_glyph_nil_decomposes (void) +{ + hb_paint_funcs_t *funcs = hb_paint_funcs_create (); + hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, NULL, NULL); + hb_paint_funcs_set_color_func (funcs, paint_color, NULL, NULL); + hb_paint_funcs_set_pop_clip_func (funcs, pop_clip, NULL, NULL); + hb_paint_funcs_make_immutable (funcs); + + paint_data_t data; + data.string = g_string_new (""); + data.level = 0; + + hb_paint_fill_glyph (funcs, &data, 42, hb_font_get_empty (), + FALSE, HB_COLOR (1, 2, 3, 4)); + + g_assert_true (data.level == 0); + g_assert_cmpstr (data.string->str, ==, + "start clip glyph 42\n" + " solid 3 2 1 4\n" + "end clip\n"); + + g_string_free (data.string, TRUE); + hb_paint_funcs_destroy (funcs); +} + int main (int argc, char **argv) @@ -840,6 +887,7 @@ main (int argc, char **argv) * below doesn't prevent them from running. */ hb_test_add (test_push_clip_path_nil_returns_null); hb_test_add (test_push_clip_path_round_trip); + hb_test_add (test_fill_glyph_nil_decomposes); for (unsigned int i = 0; i < G_N_ELEMENTS (paint_tests); i++) { From bc00cd8fb5871a874263c39fceb10e6fba47f8f7 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 12 Jul 2026 21:16:46 +0300 Subject: [PATCH 069/112] [fontations] Use fill_glyph for solid glyph fills --- src/rust/font.rs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/rust/font.rs b/src/rust/font.rs index 84bc79b57..247bcdf0c 100644 --- a/src/rust/font.rs +++ b/src/rust/font.rs @@ -701,6 +701,32 @@ impl ColorPainter for HbColorPainter<'_> { ) { unsafe { hb_paint_push_inverse_font_transform(self.paint_funcs, self.paint_data, self.font); + } + + if brush_transform.is_none() { + if let Brush::Solid { + palette_index: color_index, + alpha, + } = brush + { + let is_foreground = color_index == 0xFFFF; + let color = self.lookup_color(color_index, alpha); + unsafe { + hb_paint_fill_glyph( + self.paint_funcs, + self.paint_data, + glyph_id.to_u32() as hb_codepoint_t, + self.font, + is_foreground as hb_bool_t, + color, + ); + } + self.pop_transform(); + return; + } + } + + unsafe { hb_paint_push_clip_glyph( self.paint_funcs, self.paint_data, From e2588968aea88f019467b3500fbede3178aa2302 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 12 Jul 2026 22:20:21 +0300 Subject: [PATCH 070/112] [COLR] Emit fill_glyph for glyph clips with a solid paint Detect the fill-glyph pattern in the COLRv1 graph: a PaintGlyph whose child is a (Var)PaintSolid, and emit a single fill_glyph instead of push_clip_glyph + color + pop_clip. --- src/OT/Color/COLR/COLR.hh | 72 +++++++++++++--- src/hb-ft-colr.hh | 85 +++++++++++++------ test/api/results-paint/bad-154 | 6 +- test/api/results-paint/hand-10 | 30 ++----- test/api/results-paint/hand-10.2 | 30 ++----- test/api/results-paint/test-106 | 12 +-- test/api/results-paint/test-116 | 12 +-- test/api/results-paint/test-123 | 18 +--- test/api/results-paint/test-154 | 6 +- test/api/results-paint/testvf-106 | 12 +-- test/api/results-paint/testvf-116 | 12 +-- test/api/results-paint/testvf-123 | 18 +--- test/api/results-paint/testvf-154 | 6 +- .../expected/basic/handwriting-cff-colr-1.svg | 72 ++++------------ .../basic/handwriting-glyf-colr-1.svg | 72 ++++------------ 15 files changed, 179 insertions(+), 284 deletions(-) diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index 7db97299b..e409cb388 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -335,6 +335,12 @@ struct Variable value.get_color_stop (c, stop, varIdxBase, instancer); } + void get_solid_color (hb_paint_context_t *c, + hb_bool_t *is_foreground, hb_color_t *color) const + { + value.get_solid_color (c, varIdxBase, is_foreground, color); + } + hb_paint_extend_t get_extend () const { return value.get_extend (); @@ -390,6 +396,12 @@ struct NoVariable value.get_color_stop (c, stop, VarIdx::NO_VARIATION, instancer); } + void get_solid_color (hb_paint_context_t *c, + hb_bool_t *is_foreground, hb_color_t *color) const + { + value.get_solid_color (c, VarIdx::NO_VARIATION, is_foreground, color); + } + hb_paint_extend_t get_extend () const { return value.get_extend (); @@ -680,15 +692,21 @@ struct PaintSolid return_trace (c->check_struct (this)); } + void get_solid_color (hb_paint_context_t *c, uint32_t varIdxBase, + hb_bool_t *is_foreground, hb_color_t *color) const + { + *color = c->get_color (paletteIndex, + alpha.to_float (c->instancer (varIdxBase, 0)), + is_foreground); + } + void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const { TRACE_PAINT (this); hb_bool_t is_foreground; hb_color_t color; - color = c->get_color (paletteIndex, - alpha.to_float (c->instancer (varIdxBase, 0)), - &is_foreground); + get_solid_color (c, varIdxBase, &is_foreground, &color); c->funcs->color (c->data, is_foreground, color); } @@ -928,17 +946,7 @@ struct PaintGlyph return_trace (c->check_struct (this) && paint.sanitize (c, this)); } - void paint_glyph (hb_paint_context_t *c) const - { - TRACE_PAINT (this); - c->funcs->push_inverse_font_transform (c->data, c->font); - c->funcs->push_clip_glyph (c->data, gid, c->font); - c->funcs->push_font_transform (c->data, c->font); - c->recurse (this+paint); - c->funcs->pop_transform (c->data); - c->funcs->pop_clip (c->data); - c->funcs->pop_transform (c->data); - } + inline void paint_glyph (hb_paint_context_t *c) const; HBUINT8 format; /* format = 10 */ Offset24To paint; /* Offset (from beginning of PaintGlyph table) to Paint subtable. */ @@ -1892,6 +1900,16 @@ struct Paint } } + bool get_solid_color (hb_paint_context_t *c, + hb_bool_t *is_foreground, hb_color_t *color) const + { + switch (u.format.v) { + case 2: u.paintformat2.get_solid_color (c, is_foreground, color); return true; + case 3: u.paintformat3.get_solid_color (c, is_foreground, color); return true; + default: return false; + } + } + protected: union { struct { HBUINT8 v; } format; @@ -2803,6 +2821,32 @@ hb_paint_context_t::recurse (const Paint &paint) depth_left++; } +void PaintGlyph::paint_glyph (hb_paint_context_t *c) const +{ + TRACE_PAINT (this); + + hb_bool_t is_foreground; + hb_color_t color; + /* Optimize cases that can use a simple fill-glyph operation. */ + if (likely (c->depth_left > 0 && c->edge_count > 0) && + (this+paint).get_solid_color (c, &is_foreground, &color)) + { + c->edge_count--; + c->funcs->push_inverse_font_transform (c->data, c->font); + c->funcs->fill_glyph (c->data, gid, c->font, is_foreground, color); + c->funcs->pop_transform (c->data); + return; + } + + c->funcs->push_inverse_font_transform (c->data, c->font); + c->funcs->push_clip_glyph (c->data, gid, c->font); + c->funcs->push_font_transform (c->data, c->font); + c->recurse (this+paint); + c->funcs->pop_transform (c->data); + c->funcs->pop_clip (c->data); + c->funcs->pop_transform (c->data); +} + void PaintColrLayers::paint_glyph (hb_paint_context_t *c) const { TRACE_PAINT (this); diff --git a/src/hb-ft-colr.hh b/src/hb-ft-colr.hh index 5237dfb5d..090ebf087 100644 --- a/src/hb-ft-colr.hh +++ b/src/hb-ft-colr.hh @@ -250,6 +250,42 @@ _hb_ft_color_line_get_extend (hb_color_line_t *color_line, } } +static void +_hb_ft_get_solid_color (hb_ft_paint_context_t *c, + const FT_ColorIndex &color_index, + hb_bool_t *is_foreground, + hb_color_t *color) +{ + *is_foreground = color_index.palette_index == 0xFFFF; + + if (*is_foreground) + { + *color = HB_COLOR (hb_color_get_blue (c->foreground), + hb_color_get_green (c->foreground), + hb_color_get_red (c->foreground), + _hb_ft_color_alpha (hb_color_get_alpha (c->foreground), + color_index.alpha)); + return; + } + + if (c->funcs->custom_palette_color (c->data, color_index.palette_index, color)) + { + *color = HB_COLOR (hb_color_get_blue (*color), + hb_color_get_green (*color), + hb_color_get_red (*color), + _hb_ft_color_alpha (hb_color_get_alpha (*color), + color_index.alpha)); + return; + } + + FT_Color ft_color = c->palette[color_index.palette_index]; + *color = HB_COLOR (ft_color.blue, + ft_color.green, + ft_color.red, + _hb_ft_color_alpha (ft_color.alpha, + color_index.alpha)); +} + void _hb_ft_paint (hb_ft_paint_context_t *c, FT_OpaquePaint opaque_paint) @@ -280,34 +316,9 @@ _hb_ft_paint (hb_ft_paint_context_t *c, break; case FT_COLR_PAINTFORMAT_SOLID: { - bool is_foreground = paint.u.solid.color.palette_index == 0xFFFF; + hb_bool_t is_foreground; hb_color_t color; - if (is_foreground) - color = HB_COLOR (hb_color_get_blue (c->foreground), - hb_color_get_green (c->foreground), - hb_color_get_red (c->foreground), - _hb_ft_color_alpha (hb_color_get_alpha (c->foreground), - paint.u.solid.color.alpha)); - else - { - if (c->funcs->custom_palette_color (c->data, paint.u.solid.color.palette_index, &color)) - { - color = HB_COLOR (hb_color_get_blue (color), - hb_color_get_green (color), - hb_color_get_red (color), - _hb_ft_color_alpha (hb_color_get_alpha (color), - paint.u.solid.color.alpha)); - } - else - { - FT_Color ft_color = c->palette[paint.u.solid.color.palette_index]; - color = HB_COLOR (ft_color.blue, - ft_color.green, - ft_color.red, - _hb_ft_color_alpha (ft_color.alpha, - paint.u.solid.color.alpha)); - } - } + _hb_ft_get_solid_color (c, paint.u.solid.color, &is_foreground, &color); c->funcs->color (c->data, is_foreground, color); } break; @@ -362,6 +373,26 @@ _hb_ft_paint (hb_ft_paint_context_t *c, break; case FT_COLR_PAINTFORMAT_GLYPH: { + /* Optimize cases that can use a simple fill-glyph operation. */ + FT_COLR_Paint fill; + if (likely (c->depth_left > 0 && c->edge_count > 0) && + FT_Get_Paint (ft_face, paint.u.glyph.paint, &fill) && + fill.format == FT_COLR_PAINTFORMAT_SOLID) + { + hb_bool_t is_foreground; + hb_color_t color; + _hb_ft_get_solid_color (c, fill.u.solid.color, &is_foreground, &color); + + c->edge_count--; + c->funcs->push_inverse_font_transform (c->data, c->font); + c->ft_font->lock.unlock (); + c->funcs->fill_glyph (c->data, paint.u.glyph.glyphID, c->font, + is_foreground, color); + c->ft_font->lock.lock (); + c->funcs->pop_transform (c->data); + break; + } + c->funcs->push_inverse_font_transform (c->data, c->font); c->ft_font->lock.unlock (); c->funcs->push_clip_glyph (c->data, paint.u.glyph.glyphID, c->font); diff --git a/test/api/results-paint/bad-154 b/test/api/results-paint/bad-154 index 1dcf2489b..bd39666e4 100644 --- a/test/api/results-paint/bad-154 +++ b/test/api/results-paint/bad-154 @@ -3,11 +3,7 @@ start transform 1 0 0 1 0 0 push group push group start transform 1 0 0 1 0 0 - start clip glyph 159 - start transform 1 0 0 1 0 0 - solid 128 128 128 102 - end transform - end clip + fill glyph 159 solid 128 128 128 102 end transform pop group mode 3 pop group mode 3 diff --git a/test/api/results-paint/hand-10 b/test/api/results-paint/hand-10 index 2ba03ef53..06bfb136f 100644 --- a/test/api/results-paint/hand-10 +++ b/test/api/results-paint/hand-10 @@ -29,25 +29,13 @@ start transform 1 0 0 1 0 0 end clip end transform start transform 1 0 0 1 0 0 - start clip glyph 15 - start transform 1 0 0 1 0 0 - solid 145 103 77 255 - end transform - end clip + fill glyph 15 solid 145 103 77 255 end transform start transform 1 0 0 1 0 0 - start clip glyph 16 - start transform 1 0 0 1 0 0 - solid 30 136 229 255 - end transform - end clip + fill glyph 16 solid 30 136 229 255 end transform start transform 1 0 0 1 0 0 - start clip glyph 21 - start transform 1 0 0 1 0 0 - solid 145 103 77 255 - end transform - end clip + fill glyph 21 solid 145 103 77 255 end transform start transform 1 0 0 1 0 0 start clip glyph 16 @@ -62,11 +50,7 @@ start transform 1 0 0 1 0 0 end clip end transform start transform 1 0 0 1 0 0 - start clip glyph 18 - start transform 1 0 0 1 0 0 - solid 66 66 66 51 - end transform - end clip + fill glyph 18 solid 66 66 66 51 end transform start transform 1 0 0 1 0 0 start clip glyph 19 @@ -85,11 +69,7 @@ start transform 1 0 0 1 0 0 end clip end transform start transform 1 0 0 1 0 0 - start clip glyph 20 - start transform 1 0 0 1 0 0 - solid 145 103 77 255 - end transform - end clip + fill glyph 20 solid 145 103 77 255 end transform end clip end transform diff --git a/test/api/results-paint/hand-10.2 b/test/api/results-paint/hand-10.2 index 379a02b47..49a5a7c54 100644 --- a/test/api/results-paint/hand-10.2 +++ b/test/api/results-paint/hand-10.2 @@ -30,25 +30,13 @@ start transform 1 0 0.2 1 0 0 end clip end transform start transform 1 0 0 1 0 0 - start clip glyph 15 - start transform 1 0 0 1 0 0 - solid 145 103 77 255 - end transform - end clip + fill glyph 15 solid 145 103 77 255 end transform start transform 1 0 0 1 0 0 - start clip glyph 16 - start transform 1 0 0 1 0 0 - solid 30 136 229 255 - end transform - end clip + fill glyph 16 solid 30 136 229 255 end transform start transform 1 0 0 1 0 0 - start clip glyph 21 - start transform 1 0 0 1 0 0 - solid 145 103 77 255 - end transform - end clip + fill glyph 21 solid 145 103 77 255 end transform start transform 1 0 0 1 0 0 start clip glyph 16 @@ -63,11 +51,7 @@ start transform 1 0 0.2 1 0 0 end clip end transform start transform 1 0 0 1 0 0 - start clip glyph 18 - start transform 1 0 0 1 0 0 - solid 66 66 66 51 - end transform - end clip + fill glyph 18 solid 66 66 66 51 end transform start transform 1 0 0 1 0 0 start clip glyph 19 @@ -86,11 +70,7 @@ start transform 1 0 0.2 1 0 0 end clip end transform start transform 1 0 0 1 0 0 - start clip glyph 20 - start transform 1 0 0 1 0 0 - solid 145 103 77 255 - end transform - end clip + fill glyph 20 solid 145 103 77 255 end transform end clip end transform diff --git a/test/api/results-paint/test-106 b/test/api/results-paint/test-106 index 60bf166ff..8fe63746d 100644 --- a/test/api/results-paint/test-106 +++ b/test/api/results-paint/test-106 @@ -1,20 +1,12 @@ start transform 1 0 0 1 0 0 push group start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 0 0 255 128 - end transform - end clip + fill glyph 3 solid 0 0 255 128 end transform push group start transform 1 0.268 0 1 0 -134 start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 255 165 0 179 - end transform - end clip + fill glyph 3 solid 255 165 0 179 end transform end transform pop group mode 4 diff --git a/test/api/results-paint/test-116 b/test/api/results-paint/test-116 index 2b38f892e..8e9dca4ef 100644 --- a/test/api/results-paint/test-116 +++ b/test/api/results-paint/test-116 @@ -1,20 +1,12 @@ start transform 1 0 0 1 0 0 push group start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 0 0 255 128 - end transform - end clip + fill glyph 3 solid 0 0 255 128 end transform push group start transform 1 0 0 1 100 0 start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 255 165 0 179 - end transform - end clip + fill glyph 3 solid 255 165 0 179 end transform end transform pop group mode 4 diff --git a/test/api/results-paint/test-123 b/test/api/results-paint/test-123 index 2afe0285a..667bf84e5 100644 --- a/test/api/results-paint/test-123 +++ b/test/api/results-paint/test-123 @@ -1,30 +1,18 @@ start transform 1 0 0 1 0 0 start clip rectangle 0 0 1e+03 1e+03 start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 0 0 0 255 - end transform - end clip + fill glyph 3 solid 0 0 0 255 end transform push group start transform 0.5 0 0 0.5 166 334 start transform 1 0 0 1 0 0 - start clip glyph 2 - start transform 1 0 0 1 0 0 - solid 255 220 1 255 - end transform - end clip + fill glyph 2 solid 255 220 1 255 end transform end transform push group start transform 0.5 0 0 0.5 334 166 start transform 1 0 0 1 0 0 - start clip glyph 2 - start transform 1 0 0 1 0 0 - solid 104 199 232 255 - end transform - end clip + fill glyph 2 solid 104 199 232 255 end transform end transform pop group mode 3 diff --git a/test/api/results-paint/test-154 b/test/api/results-paint/test-154 index 750a0503c..c5644b26b 100644 --- a/test/api/results-paint/test-154 +++ b/test/api/results-paint/test-154 @@ -1,11 +1,7 @@ start transform 1 0 0 1 0 0 start clip rectangle 100 250 900 950 start transform 1 0 0 1 0 0 - start clip glyph 154 - start transform 1 0 0 1 0 0 - solid 0 0 0 255 - end transform - end clip + fill glyph 154 solid 0 0 0 255 end transform end clip end transform diff --git a/test/api/results-paint/testvf-106 b/test/api/results-paint/testvf-106 index 60bf166ff..8fe63746d 100644 --- a/test/api/results-paint/testvf-106 +++ b/test/api/results-paint/testvf-106 @@ -1,20 +1,12 @@ start transform 1 0 0 1 0 0 push group start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 0 0 255 128 - end transform - end clip + fill glyph 3 solid 0 0 255 128 end transform push group start transform 1 0.268 0 1 0 -134 start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 255 165 0 179 - end transform - end clip + fill glyph 3 solid 255 165 0 179 end transform end transform pop group mode 4 diff --git a/test/api/results-paint/testvf-116 b/test/api/results-paint/testvf-116 index 2b38f892e..8e9dca4ef 100644 --- a/test/api/results-paint/testvf-116 +++ b/test/api/results-paint/testvf-116 @@ -1,20 +1,12 @@ start transform 1 0 0 1 0 0 push group start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 0 0 255 128 - end transform - end clip + fill glyph 3 solid 0 0 255 128 end transform push group start transform 1 0 0 1 100 0 start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 255 165 0 179 - end transform - end clip + fill glyph 3 solid 255 165 0 179 end transform end transform pop group mode 4 diff --git a/test/api/results-paint/testvf-123 b/test/api/results-paint/testvf-123 index 2afe0285a..667bf84e5 100644 --- a/test/api/results-paint/testvf-123 +++ b/test/api/results-paint/testvf-123 @@ -1,30 +1,18 @@ start transform 1 0 0 1 0 0 start clip rectangle 0 0 1e+03 1e+03 start transform 1 0 0 1 0 0 - start clip glyph 3 - start transform 1 0 0 1 0 0 - solid 0 0 0 255 - end transform - end clip + fill glyph 3 solid 0 0 0 255 end transform push group start transform 0.5 0 0 0.5 166 334 start transform 1 0 0 1 0 0 - start clip glyph 2 - start transform 1 0 0 1 0 0 - solid 255 220 1 255 - end transform - end clip + fill glyph 2 solid 255 220 1 255 end transform end transform push group start transform 0.5 0 0 0.5 334 166 start transform 1 0 0 1 0 0 - start clip glyph 2 - start transform 1 0 0 1 0 0 - solid 104 199 232 255 - end transform - end clip + fill glyph 2 solid 104 199 232 255 end transform end transform pop group mode 3 diff --git a/test/api/results-paint/testvf-154 b/test/api/results-paint/testvf-154 index 750a0503c..c5644b26b 100644 --- a/test/api/results-paint/testvf-154 +++ b/test/api/results-paint/testvf-154 @@ -1,11 +1,7 @@ start transform 1 0 0 1 0 0 start clip rectangle 100 250 900 950 start transform 1 0 0 1 0 0 - start clip glyph 154 - start transform 1 0 0 1 0 0 - solid 0 0 0 255 - end transform - end clip + fill glyph 154 solid 0 0 0 255 end transform end clip end transform diff --git a/test/vector/data/expected/basic/handwriting-cff-colr-1.svg b/test/vector/data/expected/basic/handwriting-cff-colr-1.svg index ae4d35ddd..8534b1234 100644 --- a/test/vector/data/expected/basic/handwriting-cff-colr-1.svg +++ b/test/vector/data/expected/basic/handwriting-cff-colr-1.svg @@ -7,30 +7,18 @@ - + - - - - - - - - - - - - + + - - @@ -46,49 +34,29 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -97,11 +65,7 @@ - - - - - + diff --git a/test/vector/data/expected/basic/handwriting-glyf-colr-1.svg b/test/vector/data/expected/basic/handwriting-glyf-colr-1.svg index 61792c743..789b5a247 100644 --- a/test/vector/data/expected/basic/handwriting-glyf-colr-1.svg +++ b/test/vector/data/expected/basic/handwriting-glyf-colr-1.svg @@ -7,30 +7,18 @@ - + - - - - - - - - - - - - + + - - @@ -46,49 +34,29 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -97,11 +65,7 @@ - - - - - + From bbcd7d656278a8644217b7c214d96f15603752fa Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 14 Jul 2026 01:27:09 +0300 Subject: [PATCH 071/112] [doc/paint] Mention the decomposed fallback sequence for fill-glyph --- src/hb-paint.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hb-paint.h b/src/hb-paint.h index 46e83b817..c5e4add22 100644 --- a/src/hb-paint.h +++ b/src/hb-paint.h @@ -167,8 +167,10 @@ typedef hb_bool_t (*hb_paint_color_glyph_func_t) (hb_paint_funcs_t *funcs, * @color: The color to use, unpremultiplied * @user_data: User data pointer passed to hb_paint_funcs_set_fill_glyph_func() * - * A virtual method for the #hb_paint_funcs_t to fill a glyph's - * shape with a solid color. + * A virtual method for the #hb_paint_funcs_t to fill a glyph's shape with + * a solid color. If not implemented, a sequence of "push-clip-glyph", + * "color", "pop-clip" paint operations, in that order, will be emitted + * instead. * * XSince: REPLACEME */ From 4fbbe7ae4fdc031f82c3c08ec5cbe809778c2623 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 14 Jul 2026 13:45:09 -0600 Subject: [PATCH 072/112] [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 --- src/hb-ot-font.cc | 4 +++- test/api/test-ot-face.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index f42f679df..d91ee7af2 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -289,7 +289,7 @@ struct hb_ot_font_t void check_serial (hb_font_t *font) const { - int font_serial = font->serial_coords.get_acquire (); + int font_serial = font->serial.get_acquire (); if (cached_serial.get_acquire () != font_serial) { /* These caches are dependent on scale and synthetic settings. @@ -644,6 +644,8 @@ hb_ot_get_glyph_v_origins (hb_font_t *font, const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; const hb_ot_face_t *ot_face = ot_font->ot_face; + ot_font->check_serial (font); + /* First, set all the x values to half the advance width. */ font->get_glyph_h_advances (count, first_glyph, glyph_stride, diff --git a/test/api/test-ot-face.c b/test/api/test-ot-face.c index 31779af46..37c2be127 100644 --- a/test/api/test-ot-face.c +++ b/test/api/test-ot-face.c @@ -215,6 +215,30 @@ test_ot_var_axis_on_zero_named_instance (void) hb_face_destroy (face); } +#ifndef HB_NO_VERTICAL +static void +test_ot_font_v_origin_cache_invalidated_by_scale (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/Mplus1p-Regular.660E.ttf"); + hb_font_t *font = hb_font_create (face); + hb_codepoint_t glyph; + hb_position_t x, y1, y2; + + g_assert_true (hb_font_get_nominal_glyph (font, 0x660E, &glyph)); + + hb_font_set_scale (font, 1000, 1000); + g_assert_true (hb_font_get_glyph_v_origin (font, glyph, &x, &y1)); + + hb_font_set_scale (font, 1000, 2000); + g_assert_true (hb_font_get_glyph_v_origin (font, glyph, &x, &y2)); + + g_assert_cmpint (y2, ==, y1 * 2); + + hb_font_destroy (font); + hb_face_destroy (face); +} +#endif + int main (int argc, char **argv) { @@ -222,6 +246,9 @@ main (int argc, char **argv) hb_test_add (test_ot_face_empty); hb_test_add (test_ot_var_axis_on_zero_named_instance); +#ifndef HB_NO_VERTICAL + hb_test_add (test_ot_font_v_origin_cache_invalidated_by_scale); +#endif return hb_test_run(); } From 946901f88d69ddb1436474c5bb2908e674bb680f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 14 Jul 2026 16:00:07 -0600 Subject: [PATCH 073/112] [svg] Use ISALNUM, not isalnum --- src/OT/Color/svg/svg.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OT/Color/svg/svg.hh b/src/OT/Color/svg/svg.hh index b89894c64..e0096d5bf 100644 --- a/src/OT/Color/svg/svg.hh +++ b/src/OT/Color/svg/svg.hh @@ -499,7 +499,7 @@ parse_cache_entries_linear (const char *svg, while (p + name_len < gt) { unsigned char c = (unsigned char) name[name_len]; - if (!(isalnum (c) || c == '_' || c == '-' || c == ':')) + if (!(ISALNUM (c) || c == '_' || c == '-' || c == ':')) break; name_len++; } From 99380f0e44923bb1e8da71cfe8de85a6b4e2235a Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Tue, 14 Jul 2026 20:46:15 +0000 Subject: [PATCH 074/112] 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. --- src/gen-def.py | 1 + src/hb-subset-input.cc | 372 +++++++++++++++++++++++++++++++++++++++++ src/hb-subset.h | 3 + test/api/test-subset.c | 197 ++++++++++++++++++++++ 4 files changed, 573 insertions(+) diff --git a/src/gen-def.py b/src/gen-def.py index be4e68881..d0da2311a 100755 --- a/src/gen-def.py +++ b/src/gen-def.py @@ -21,6 +21,7 @@ if '--experimental-api' not in sys.argv: experimental_symbols = \ """hb_shape_justify hb_subset_input_override_name_table +hb_subset_input_to_string_or_fail hb_subset_cff_get_charstring_data hb_subset_cff_get_charstrings_index hb_subset_cff2_get_charstring_data diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 8fc09bd9a..217bcb391 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -734,6 +734,378 @@ hb_subset_axis_range_to_string (hb_subset_input_t *input, } #endif +#ifdef HB_EXPERIMENTAL_API +static void +_append_arg (hb_vector_t &sb, const char *arg) +{ + if (sb.in_error ()) return; + if (sb.length) + sb.push (' '); + unsigned len = strlen (arg); + sb.extend (hb_bytes_t (arg, len)); +} + +static void +_format_number_set (const hb_set_t *set, bool is_hex, hb_vector_t &out) +{ + hb_codepoint_t first = HB_SET_VALUE_INVALID, last = HB_SET_VALUE_INVALID; + bool first_range = true; + while (hb_set_next_range (set, &first, &last)) + { + if (!first_range) + out.push (','); + first_range = false; + + char buf[64]; + int len; + if (first == last) + { + if (is_hex) + len = snprintf (buf, sizeof (buf), "%X", first); + else + len = snprintf (buf, sizeof (buf), "%u", first); + } + else + { + if (is_hex) + len = snprintf (buf, sizeof (buf), "%X-%X", first, last); + else + len = snprintf (buf, sizeof (buf), "%u-%u", first, last); + } + if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return; + out.extend (hb_bytes_t (buf, len)); + } +} + +static void +_format_tag (hb_tag_t tag, hb_vector_t &out) +{ + char buf[4]; + hb_tag_to_string (tag, buf); + + unsigned len = 4; + while (len > 0 && buf[len - 1] == ' ') + len--; + + if (len == 0) + { + static const char spaces[4] = {'_', '_', '_', '_'}; + out.extend (hb_bytes_t (spaces, 4)); + return; + } + + for (unsigned i = 0; i < len; i++) + { + char c = buf[i]; + if (!((c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') || + (c >= '0' && c <= '9') || + c == '-' || c == '_')) + { + c = '_'; + } + out.push (c); + } +} + +static void +_format_tag_set (const hb_set_t *set, hb_vector_t &out) +{ + hb_codepoint_t tag = HB_SET_VALUE_INVALID; + bool first_tag = true; + while (hb_set_next (set, &tag)) + { + if (!first_tag) + out.push (','); + first_tag = false; + + _format_tag (tag, out); + } +} + +static bool +_is_set_default (const hb_set_t *set, const hb_set_t *default_set) +{ + return hb_set_is_inverted (set) == hb_set_is_inverted (default_set) && + hb_set_is_equal (set, default_set); +} + +template +static void +_format_set_arg (const hb_set_t *set, + const char *opt_name, + Formatter &&formatter, + hb_vector_t &sb) +{ + if (hb_set_is_inverted (set)) + { + hb_set_t *excluded = hb_set_copy (set); + hb_set_invert (excluded); + + hb_vector_t opt; + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t ("=*", 2)); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + + if (!hb_set_is_empty (excluded)) + { + hb_vector_t formatted; + formatter (excluded, formatted); + if (formatted.length) + { + hb_vector_t opt2; + opt2.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt2.extend (hb_bytes_t ("-=", 2)); + opt2.extend (formatted.as_array ()); + opt2.push ('\0'); + if (opt2.arrayZ) _append_arg (sb, opt2.arrayZ); + } + } + hb_set_destroy (excluded); + } + else if (hb_set_is_empty (set)) + { + hb_vector_t opt; + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t ("-=*", 3)); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + else + { + hb_vector_t formatted; + formatter (set, formatted); + if (formatted.length) + { + hb_vector_t opt; + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t ("=", 1)); + opt.extend (formatted.as_array ()); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + } +} + +static void +_format_number_set_arg (const hb_set_t *set, + const char *opt_name, + bool is_hex, + hb_vector_t &sb) +{ + _format_set_arg (set, opt_name, [is_hex] (const hb_set_t *s, hb_vector_t &out) { + _format_number_set (s, is_hex, out); + }, sb); +} + +static void +_format_tag_set_arg (const hb_set_t *set, + const char *opt_name, + hb_vector_t &sb) +{ + _format_set_arg (set, opt_name, _format_tag_set, sb); +} + +static bool +_format_glyph_map_arg (const hb_map_t &glyph_map, + hb_vector_t &sb) +{ + if (glyph_map.is_empty ()) + return true; + + hb_set_t keys; + hb_map_keys (&glyph_map, &keys); + hb_vector_t pairs; + hb_codepoint_t key = HB_SET_VALUE_INVALID; + bool first = true; + while (hb_set_next (&keys, &key)) + { + if (!first) + pairs.push (','); + first = false; + hb_codepoint_t val = hb_map_get (&glyph_map, key); + char buf[64]; + int len = snprintf (buf, sizeof (buf), "%u:%u", key, val); + if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return false; + pairs.extend (hb_bytes_t (buf, len)); + } + if (pairs.length) + { + hb_vector_t opt; + opt.extend (hb_bytes_t ("--gid-map=", 10)); + opt.extend (pairs.as_array ()); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + return true; +} + +static bool +_format_axes_location_arg (const hb_hashmap_t &axes_location, + hb_vector_t &sb) +{ + if (axes_location.is_empty ()) + return true; + + hb_vector_t axis_tags; + for (auto tag : axes_location.keys ()) + axis_tags.push (tag); + axis_tags.qsort ([] (const hb_tag_t &a, const hb_tag_t &b) { return a < b ? -1 : a > b ? 1 : 0; }); + + hb_vector_t specs; + bool first = true; + for (hb_tag_t tag : axis_tags) + { + Triple triple = axes_location.get (tag); + if (!first) + specs.push (','); + first = false; + + hb_vector_t tag_buf; + _format_tag (tag, tag_buf); + + char buf[128]; + int len; + if (triple.minimum == triple.middle && triple.middle == triple.maximum) + { + len = snprintf (buf, sizeof (buf), "%.*s=%g", tag_buf.length, tag_buf.arrayZ, (double) triple.middle); + } + else if (std::isnan (triple.minimum) && std::isnan (triple.middle) && std::isnan (triple.maximum)) + { + len = snprintf (buf, sizeof (buf), "%.*s=drop", tag_buf.length, tag_buf.arrayZ); + } + else + { + len = snprintf (buf, sizeof (buf), "%.*s=%g:%g:%g", tag_buf.length, tag_buf.arrayZ, + (double) triple.minimum, (double) triple.middle, (double) triple.maximum); + } + if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return false; + specs.extend (hb_bytes_t (buf, len)); + } + if (specs.length) + { + hb_vector_t opt; + opt.extend (hb_bytes_t ("--variations=", 13)); + opt.extend (specs.as_array ()); + opt.push ('\0'); + if (opt.arrayZ) _append_arg (sb, opt.arrayZ); + } + return true; +} + +/** + * hb_subset_input_to_string_or_fail: + * @input: a #hb_subset_input_t object. + * + * Produces a command line string representation of the given subset input + * suitable for use with the `util/hb-subset` command line tool. + * + * Return value: (transfer full): A new #hb_blob_t containing the command line + * string, or `NULL` if failed. Destroy with hb_blob_destroy(). + * + * XSince: EXPERIMENTAL + **/ +hb_blob_t * +hb_subset_input_to_string_or_fail (hb_subset_input_t *input) +{ + if (unlikely (!input || input->in_error ())) + return nullptr; + + hb_vector_t sb; + + struct flag_option_t { + hb_subset_flags_t flag; + const char *option; + }; + static const flag_option_t flag_options[] = { + { HB_SUBSET_FLAGS_NO_HINTING, "--no-hinting" }, + { HB_SUBSET_FLAGS_RETAIN_GIDS, "--retain-gids" }, + { HB_SUBSET_FLAGS_DESUBROUTINIZE, "--desubroutinize" }, + { HB_SUBSET_FLAGS_NAME_LEGACY, "--name-legacy" }, + { HB_SUBSET_FLAGS_SET_OVERLAPS_FLAG, "--set-overlaps-flag" }, + { HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED, "--passthrough-tables" }, + { HB_SUBSET_FLAGS_NOTDEF_OUTLINE, "--notdef-outline" }, + { HB_SUBSET_FLAGS_GLYPH_NAMES, "--glyph-names" }, + { HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES, "--no-prune-unicode-ranges" }, + { HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE, "--no-layout-closure" }, + { HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS, "--optimize" }, + { HB_SUBSET_FLAGS_NO_BIDI_CLOSURE, "--no-bidi-closure" }, +#ifdef HB_EXPERIMENTAL_API + { HB_SUBSET_FLAGS_IFTB_REQUIREMENTS, "--iftb-requirements" }, + { HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS, "--retain-num-glyphs" }, +#endif + { HB_SUBSET_FLAGS_DOWNGRADE_CFF2, "--downgrade-cff2" }, + }; + +#ifdef HB_EXPERIMENTAL_API + static_assert (sizeof (flag_options) / sizeof (flag_options[0]) == 15, + "Check all flags in hb_subset_flags_t are handled here."); +#else + static_assert (sizeof (flag_options) / sizeof (flag_options[0]) == 13, + "Check all flags in hb_subset_flags_t are handled here."); +#endif + + for (const auto &fo : flag_options) + { + if (input->flags & fo.flag) + { + _append_arg (sb, fo.option); + } + } + + hb_subset_input_t *default_input = hb_subset_input_create_or_fail (); + if (unlikely (!default_input)) + return nullptr; + + // Serialize all set flags if they are not equal to their default setting: + if (!_is_set_default (input->sets.unicodes, default_input->sets.unicodes)) + _format_number_set_arg (input->sets.unicodes, "--unicodes", true, sb); + + if (!_is_set_default (input->sets.glyphs, default_input->sets.glyphs)) + _format_number_set_arg (input->sets.glyphs, "--gids", false, sb); + + if (!_is_set_default (input->sets.name_ids, default_input->sets.name_ids)) + _format_number_set_arg (input->sets.name_ids, "--name-IDs", false, sb); + + if (!_is_set_default (input->sets.name_languages, default_input->sets.name_languages)) + _format_number_set_arg (input->sets.name_languages, "--name-languages", false, sb); + + if (!_is_set_default (input->sets.layout_features, default_input->sets.layout_features)) + _format_tag_set_arg (input->sets.layout_features, "--layout-features", sb); + + if (!_is_set_default (input->sets.layout_scripts, default_input->sets.layout_scripts)) + _format_tag_set_arg (input->sets.layout_scripts, "--layout-scripts", sb); + + if (!_is_set_default (input->sets.drop_tables, default_input->sets.drop_tables)) + _format_tag_set_arg (input->sets.drop_tables, "--drop-tables", sb); + + hb_subset_input_destroy (default_input); + + static_assert (sizeof (input->sets) / sizeof (hb_set_t*) == 8, + "Check all sets in hb_subset_input_t::sets_t are handled here."); + + if (unlikely (!_format_glyph_map_arg (input->glyph_map, sb))) + return nullptr; + + if (unlikely (!_format_axes_location_arg (input->axes_location, sb))) + return nullptr; + + if (unlikely (sb.in_error ())) + return nullptr; + + char *buf = (char *) hb_malloc (sb.length + 1); + if (unlikely (!buf)) + return nullptr; + + if (sb.length) + hb_memcpy (buf, sb.arrayZ, sb.length); + buf[sb.length] = '\0'; + + return hb_blob_create_or_fail (buf, sb.length, HB_MEMORY_MODE_WRITABLE, buf, hb_free); +} +#endif + /** * hb_subset_preprocess: * @source: a #hb_face_t object. diff --git a/src/hb-subset.h b/src/hb-subset.h index a13349ac8..6f623273d 100644 --- a/src/hb-subset.h +++ b/src/hb-subset.h @@ -228,6 +228,9 @@ hb_subset_axis_range_to_string (hb_subset_input_t *input, unsigned size); #ifdef HB_EXPERIMENTAL_API +HB_EXTERN hb_blob_t * +hb_subset_input_to_string_or_fail (hb_subset_input_t *input); + HB_EXTERN hb_bool_t hb_subset_input_override_name_table (hb_subset_input_t *input, hb_ot_name_id_t name_id, diff --git a/test/api/test-subset.c b/test/api/test-subset.c index ad78260d0..3cd9f6e5e 100644 --- a/test/api/test-subset.c +++ b/test/api/test-subset.c @@ -403,6 +403,201 @@ test_subset_cff2_get_charstring_data_lifetime (void) #endif +#ifdef HB_EXPERIMENTAL_API +static void +test_subset_input_to_string (void) +{ + /* Test NULL input */ + g_assert_null (hb_subset_input_to_string_or_fail (NULL)); + + /* Test default input -> empty string */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + g_assert_cmpint (len, ==, 0); + g_assert_cmpstr (data, ==, ""); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test unicodes ranges */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + hb_set_t *unicodes = hb_subset_input_unicode_set (input); + hb_set_add (unicodes, 0x41); + hb_set_add (unicodes, 0x42); + hb_set_add (unicodes, 0x43); + hb_set_add (unicodes, 0x45); + hb_set_add (unicodes, 0x61); + hb_set_add (unicodes, 0x62); + hb_set_add (unicodes, 0x63); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + g_assert_cmpstr (data, ==, "--unicodes=41-43,45,61-63"); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test gids ranges and flags */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + hb_set_t *gids = hb_subset_input_glyph_set (input); + hb_set_add (gids, 1); + hb_set_add (gids, 2); + hb_set_add (gids, 3); + hb_set_add (gids, 5); + hb_set_add (gids, 10); + hb_set_add (gids, 11); + hb_subset_input_set_flags (input, HB_SUBSET_FLAGS_NO_HINTING | HB_SUBSET_FLAGS_RETAIN_GIDS); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + g_assert_cmpstr (data, ==, "--no-hinting --retain-gids --gids=1-3,5,10-11"); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test keep everything */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + hb_subset_input_keep_everything (input); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + const char *expected = "--name-legacy --passthrough-tables --notdef-outline --glyph-names --no-prune-unicode-ranges --unicodes=* --gids=* --name-IDs=* --name-languages=* --layout-features=* --drop-tables-=*"; + g_assert_cmpstr (data, ==, expected); + g_assert_cmpint (len, ==, strlen (expected)); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test inverted sets with exclusions */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + hb_set_t *unicodes = hb_subset_input_set (input, HB_SUBSET_SETS_UNICODE); + hb_set_invert (unicodes); + hb_set_del (unicodes, 0x20); + hb_set_del (unicodes, 0x41); + hb_set_del (unicodes, 0x42); + hb_set_del (unicodes, 0x43); + + hb_set_t *gids = hb_subset_input_set (input, HB_SUBSET_SETS_GLYPH_INDEX); + hb_set_invert (gids); + hb_set_del (gids, 5); + hb_set_del (gids, 6); + hb_set_del (gids, 7); + + hb_set_t *features = hb_subset_input_set (input, HB_SUBSET_SETS_LAYOUT_FEATURE_TAG); + hb_set_clear (features); + hb_set_invert (features); + hb_set_del (features, HB_TAG ('k', 'e', 'r', 'n')); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + const char *expected = "--unicodes=* --unicodes-=20,41-43 --gids=* --gids-=5-7 --layout-features=* --layout-features-=kern"; + g_assert_cmpstr (data, ==, expected); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test empty non-default sets */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + hb_set_clear (hb_subset_input_set (input, HB_SUBSET_SETS_NAME_ID)); + hb_set_clear (hb_subset_input_set (input, HB_SUBSET_SETS_NAME_LANG_ID)); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + const char *expected = "--name-IDs-=* --name-languages-=*"; + g_assert_cmpstr (data, ==, expected); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test non-default non-inverted tag sets */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + + hb_set_t *features = hb_subset_input_set (input, HB_SUBSET_SETS_LAYOUT_FEATURE_TAG); + hb_set_clear (features); + hb_set_add (features, HB_TAG ('l', 'i', 'g', 'a')); + hb_set_add (features, HB_TAG ('k', 'e', 'r', 'n')); + + hb_set_t *scripts = hb_subset_input_set (input, HB_SUBSET_SETS_LAYOUT_SCRIPT_TAG); + hb_set_clear (scripts); + hb_set_add (scripts, HB_TAG ('l', 'a', 't', 'n')); + + hb_set_t *drop_tables = hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG); + hb_set_clear (drop_tables); + hb_set_add (drop_tables, HB_TAG ('G', 'S', 'U', 'B')); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + const char *expected = "--layout-features=kern,liga --layout-scripts=latn --drop-tables=GSUB"; + g_assert_cmpstr (data, ==, expected); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test tag sanitization with unsafe ASCII characters */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + + hb_set_t *features = hb_subset_input_set (input, HB_SUBSET_SETS_LAYOUT_FEATURE_TAG); + hb_set_clear (features); + /* Tag with space, newline, and single-quote: 'a \n'' */ + hb_set_add (features, HB_TAG ('a', ' ', '\n', '\'')); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + const char *expected = "--layout-features=a___"; + g_assert_cmpstr (data, ==, expected); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } + + /* Test trimming trailing whitespace from tags */ + { + hb_subset_input_t *input = hb_subset_input_create_or_fail (); + + hb_set_t *drop_tables = hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG); + hb_set_clear (drop_tables); + hb_set_add (drop_tables, HB_TAG ('c', 'v', 't', ' ')); + + hb_set_t *features = hb_subset_input_set (input, HB_SUBSET_SETS_LAYOUT_FEATURE_TAG); + hb_set_clear (features); + hb_set_add (features, HB_TAG (' ', ' ', ' ', ' ')); + + hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); + g_assert_nonnull (blob); + unsigned len = 0; + const char *data = hb_blob_get_data (blob, &len); + const char *expected = "--layout-features=____ --drop-tables=cvt"; + g_assert_cmpstr (data, ==, expected); + hb_blob_destroy (blob); + hb_subset_input_destroy (input); + } +} +#endif + int main (int argc, char **argv) { @@ -417,6 +612,7 @@ main (int argc, char **argv) hb_test_add (test_subset_create_for_tables_face); #ifdef HB_EXPERIMENTAL_API + hb_test_add (test_subset_input_to_string); hb_test_add (test_subset_cff2_get_charstring_data); hb_test_add (test_subset_cff2_get_all_charstrings_data); hb_test_add (test_subset_cff2_get_charstring_data_no_cff); @@ -426,3 +622,4 @@ main (int argc, char **argv) return hb_test_run(); } + From 2725565dab07f5ac385cf03b9eb8eb65e541d09e Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Tue, 14 Jul 2026 21:35:33 +0000 Subject: [PATCH 075/112] Address review comments. --- docs/harfbuzz-sections.txt | 1 + src/hb-subset-input.cc | 115 +++++++++++++++++++------------------ test/api/test-subset.c | 6 +- 3 files changed, 62 insertions(+), 60 deletions(-) diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt index 955e33b81..29e578f0e 100644 --- a/docs/harfbuzz-sections.txt +++ b/docs/harfbuzz-sections.txt @@ -999,6 +999,7 @@ hb_subset_serialize_link_t hb_subset_serialize_object_t hb_subset_serialize_or_fail +hb_subset_input_to_string_or_fail hb_subset_input_override_name_table hb_subset_cff_get_charstring_data hb_subset_cff_get_charstrings_index diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 217bcb391..66d1ba9b7 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -744,9 +744,8 @@ _append_arg (hb_vector_t &sb, const char *arg) unsigned len = strlen (arg); sb.extend (hb_bytes_t (arg, len)); } - static void -_format_number_set (const hb_set_t *set, bool is_hex, hb_vector_t &out) +_format_number_set (const hb_set_t *set, hb_vector_t &out, unsigned base = 10) { hb_codepoint_t first = HB_SET_VALUE_INVALID, last = HB_SET_VALUE_INVALID; bool first_range = true; @@ -760,14 +759,14 @@ _format_number_set (const hb_set_t *set, bool is_hex, hb_vector_t &out) int len; if (first == last) { - if (is_hex) + if (base == 16) len = snprintf (buf, sizeof (buf), "%X", first); else len = snprintf (buf, sizeof (buf), "%u", first); } else { - if (is_hex) + if (base == 16) len = snprintf (buf, sizeof (buf), "%X-%X", first, last); else len = snprintf (buf, sizeof (buf), "%u-%u", first, last); @@ -837,13 +836,16 @@ _format_set_arg (const hb_set_t *set, Formatter &&formatter, hb_vector_t &sb) { + char opt_prefix[64]; + snprintf (opt_prefix, sizeof (opt_prefix), "--%s", opt_name); + if (hb_set_is_inverted (set)) { hb_set_t *excluded = hb_set_copy (set); hb_set_invert (excluded); hb_vector_t opt; - opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); opt.extend (hb_bytes_t ("=*", 2)); opt.push ('\0'); if (opt.arrayZ) _append_arg (sb, opt.arrayZ); @@ -855,7 +857,7 @@ _format_set_arg (const hb_set_t *set, if (formatted.length) { hb_vector_t opt2; - opt2.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt2.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); opt2.extend (hb_bytes_t ("-=", 2)); opt2.extend (formatted.as_array ()); opt2.push ('\0'); @@ -867,7 +869,7 @@ _format_set_arg (const hb_set_t *set, else if (hb_set_is_empty (set)) { hb_vector_t opt; - opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); opt.extend (hb_bytes_t ("-=*", 3)); opt.push ('\0'); if (opt.arrayZ) _append_arg (sb, opt.arrayZ); @@ -879,7 +881,7 @@ _format_set_arg (const hb_set_t *set, if (formatted.length) { hb_vector_t opt; - opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); + opt.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); opt.extend (hb_bytes_t ("=", 1)); opt.extend (formatted.as_array ()); opt.push ('\0'); @@ -891,11 +893,11 @@ _format_set_arg (const hb_set_t *set, static void _format_number_set_arg (const hb_set_t *set, const char *opt_name, - bool is_hex, - hb_vector_t &sb) + hb_vector_t &sb, + unsigned base = 10) { - _format_set_arg (set, opt_name, [is_hex] (const hb_set_t *s, hb_vector_t &out) { - _format_number_set (s, is_hex, out); + _format_set_arg (set, opt_name, [base] (const hb_set_t *s, hb_vector_t &out) { + _format_number_set (s, out, base); }, sb); } @@ -969,15 +971,15 @@ _format_axes_location_arg (const hb_hashmap_t &axes_location, int len; if (triple.minimum == triple.middle && triple.middle == triple.maximum) { - len = snprintf (buf, sizeof (buf), "%.*s=%g", tag_buf.length, tag_buf.arrayZ, (double) triple.middle); + len = snprintf (buf, sizeof (buf), "%.*s=%g", (int) tag_buf.length, tag_buf.arrayZ, (double) triple.middle); } else if (std::isnan (triple.minimum) && std::isnan (triple.middle) && std::isnan (triple.maximum)) { - len = snprintf (buf, sizeof (buf), "%.*s=drop", tag_buf.length, tag_buf.arrayZ); + len = snprintf (buf, sizeof (buf), "%.*s=drop", (int) tag_buf.length, tag_buf.arrayZ); } else { - len = snprintf (buf, sizeof (buf), "%.*s=%g:%g:%g", tag_buf.length, tag_buf.arrayZ, + len = snprintf (buf, sizeof (buf), "%.*s=%g:%g:%g", (int) tag_buf.length, tag_buf.arrayZ, (double) triple.minimum, (double) triple.middle, (double) triple.maximum); } if (unlikely (len < 0 || (size_t) len >= sizeof (buf))) return false; @@ -999,7 +1001,7 @@ _format_axes_location_arg (const hb_hashmap_t &axes_location, * @input: a #hb_subset_input_t object. * * Produces a command line string representation of the given subset input - * suitable for use with the `util/hb-subset` command line tool. + * suitable for use with the `hb-subset` command line tool. * * Return value: (transfer full): A new #hb_blob_t containing the command line * string, or `NULL` if failed. Destroy with hb_blob_destroy(). @@ -1016,26 +1018,26 @@ hb_subset_input_to_string_or_fail (hb_subset_input_t *input) struct flag_option_t { hb_subset_flags_t flag; - const char *option; + char option[32]; }; static const flag_option_t flag_options[] = { - { HB_SUBSET_FLAGS_NO_HINTING, "--no-hinting" }, - { HB_SUBSET_FLAGS_RETAIN_GIDS, "--retain-gids" }, - { HB_SUBSET_FLAGS_DESUBROUTINIZE, "--desubroutinize" }, - { HB_SUBSET_FLAGS_NAME_LEGACY, "--name-legacy" }, - { HB_SUBSET_FLAGS_SET_OVERLAPS_FLAG, "--set-overlaps-flag" }, - { HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED, "--passthrough-tables" }, - { HB_SUBSET_FLAGS_NOTDEF_OUTLINE, "--notdef-outline" }, - { HB_SUBSET_FLAGS_GLYPH_NAMES, "--glyph-names" }, - { HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES, "--no-prune-unicode-ranges" }, - { HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE, "--no-layout-closure" }, - { HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS, "--optimize" }, - { HB_SUBSET_FLAGS_NO_BIDI_CLOSURE, "--no-bidi-closure" }, + { HB_SUBSET_FLAGS_NO_HINTING, "no-hinting" }, + { HB_SUBSET_FLAGS_RETAIN_GIDS, "retain-gids" }, + { HB_SUBSET_FLAGS_DESUBROUTINIZE, "desubroutinize" }, + { HB_SUBSET_FLAGS_NAME_LEGACY, "name-legacy" }, + { HB_SUBSET_FLAGS_SET_OVERLAPS_FLAG, "set-overlaps-flag" }, + { HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED, "passthrough-tables" }, + { HB_SUBSET_FLAGS_NOTDEF_OUTLINE, "notdef-outline" }, + { HB_SUBSET_FLAGS_GLYPH_NAMES, "glyph-names" }, + { HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES, "no-prune-unicode-ranges" }, + { HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE, "no-layout-closure" }, + { HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS, "optimize" }, + { HB_SUBSET_FLAGS_NO_BIDI_CLOSURE, "no-bidi-closure" }, #ifdef HB_EXPERIMENTAL_API - { HB_SUBSET_FLAGS_IFTB_REQUIREMENTS, "--iftb-requirements" }, - { HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS, "--retain-num-glyphs" }, + { HB_SUBSET_FLAGS_IFTB_REQUIREMENTS, "iftb-requirements" }, + { HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS, "retain-num-glyphs" }, #endif - { HB_SUBSET_FLAGS_DOWNGRADE_CFF2, "--downgrade-cff2" }, + { HB_SUBSET_FLAGS_DOWNGRADE_CFF2, "downgrade-cff2" }, }; #ifdef HB_EXPERIMENTAL_API @@ -1050,7 +1052,9 @@ hb_subset_input_to_string_or_fail (hb_subset_input_t *input) { if (input->flags & fo.flag) { - _append_arg (sb, fo.option); + char buf[36]; + snprintf (buf, sizeof (buf), "--%s", fo.option); + _append_arg (sb, buf); } } @@ -1058,27 +1062,26 @@ hb_subset_input_to_string_or_fail (hb_subset_input_t *input) if (unlikely (!default_input)) return nullptr; - // Serialize all set flags if they are not equal to their default setting: - if (!_is_set_default (input->sets.unicodes, default_input->sets.unicodes)) - _format_number_set_arg (input->sets.unicodes, "--unicodes", true, sb); + // Serialize all sets if they are not equal to their default setting: +#define PROCESS_NUMBER_SET(field, opt_name, ...) \ + if (!_is_set_default (input->sets.field, default_input->sets.field)) \ + _format_number_set_arg (input->sets.field, opt_name, sb, ##__VA_ARGS__) - if (!_is_set_default (input->sets.glyphs, default_input->sets.glyphs)) - _format_number_set_arg (input->sets.glyphs, "--gids", false, sb); +#define PROCESS_TAG_SET(field, opt_name) \ + if (!_is_set_default (input->sets.field, default_input->sets.field)) \ + _format_tag_set_arg (input->sets.field, opt_name, sb) - if (!_is_set_default (input->sets.name_ids, default_input->sets.name_ids)) - _format_number_set_arg (input->sets.name_ids, "--name-IDs", false, sb); + PROCESS_NUMBER_SET (unicodes, "unicodes", 16); + PROCESS_NUMBER_SET (glyphs, "gids"); + PROCESS_NUMBER_SET (name_ids, "name-IDs"); + PROCESS_NUMBER_SET (name_languages, "name-languages"); + PROCESS_TAG_SET (layout_features, "layout-features"); + PROCESS_TAG_SET (layout_scripts, "layout-scripts"); + PROCESS_TAG_SET (drop_tables, "drop-tables"); + PROCESS_TAG_SET (no_subset_tables, "passthrough-tables"); - if (!_is_set_default (input->sets.name_languages, default_input->sets.name_languages)) - _format_number_set_arg (input->sets.name_languages, "--name-languages", false, sb); - - if (!_is_set_default (input->sets.layout_features, default_input->sets.layout_features)) - _format_tag_set_arg (input->sets.layout_features, "--layout-features", sb); - - if (!_is_set_default (input->sets.layout_scripts, default_input->sets.layout_scripts)) - _format_tag_set_arg (input->sets.layout_scripts, "--layout-scripts", sb); - - if (!_is_set_default (input->sets.drop_tables, default_input->sets.drop_tables)) - _format_tag_set_arg (input->sets.drop_tables, "--drop-tables", sb); +#undef PROCESS_NUMBER_SET +#undef PROCESS_TAG_SET hb_subset_input_destroy (default_input); @@ -1091,18 +1094,16 @@ hb_subset_input_to_string_or_fail (hb_subset_input_t *input) if (unlikely (!_format_axes_location_arg (input->axes_location, sb))) return nullptr; + sb.push ('\0'); if (unlikely (sb.in_error ())) return nullptr; - char *buf = (char *) hb_malloc (sb.length + 1); + unsigned len = 0; + char *buf = sb.steal (&len); if (unlikely (!buf)) return nullptr; - if (sb.length) - hb_memcpy (buf, sb.arrayZ, sb.length); - buf[sb.length] = '\0'; - - return hb_blob_create_or_fail (buf, sb.length, HB_MEMORY_MODE_WRITABLE, buf, hb_free); + return hb_blob_create_or_fail (buf, len, HB_MEMORY_MODE_WRITABLE, buf, hb_free); } #endif diff --git a/test/api/test-subset.c b/test/api/test-subset.c index 3cd9f6e5e..201c8562d 100644 --- a/test/api/test-subset.c +++ b/test/api/test-subset.c @@ -338,7 +338,7 @@ test_subset_cff2_get_charstring_data_no_cff (void) hb_blob_t* cs0 = hb_subset_cff2_get_charstring_data (face, 0); g_assert_true (hb_blob_get_length (cs0) == 0); - + hb_face_destroy (builder); hb_blob_destroy (face_blob); hb_face_destroy (face); @@ -417,7 +417,7 @@ test_subset_input_to_string (void) g_assert_nonnull (blob); unsigned len = 0; const char *data = hb_blob_get_data (blob, &len); - g_assert_cmpint (len, ==, 0); + g_assert_cmpint (len, ==, 1); g_assert_cmpstr (data, ==, ""); hb_blob_destroy (blob); hb_subset_input_destroy (input); @@ -476,7 +476,7 @@ test_subset_input_to_string (void) const char *data = hb_blob_get_data (blob, &len); const char *expected = "--name-legacy --passthrough-tables --notdef-outline --glyph-names --no-prune-unicode-ranges --unicodes=* --gids=* --name-IDs=* --name-languages=* --layout-features=* --drop-tables-=*"; g_assert_cmpstr (data, ==, expected); - g_assert_cmpint (len, ==, strlen (expected)); + g_assert_cmpint (len - 1, ==, strlen (expected)); hb_blob_destroy (blob); hb_subset_input_destroy (input); } From d7861576ae9026f9776b4e94addb69af4f14fdd2 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Tue, 14 Jul 2026 22:10:43 +0000 Subject: [PATCH 076/112] More fixes for review comments. --- src/hb-subset-input.cc | 25 +++++++++++-------------- test/api/test-subset.c | 3 ++- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index 66d1ba9b7..117a45fec 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -747,6 +747,9 @@ _append_arg (hb_vector_t &sb, const char *arg) static void _format_number_set (const hb_set_t *set, hb_vector_t &out, unsigned base = 10) { + assert (base == 10 || base == 16); + if (unlikely (base != 10 && base != 16)) return; + hb_codepoint_t first = HB_SET_VALUE_INVALID, last = HB_SET_VALUE_INVALID; bool first_range = true; while (hb_set_next_range (set, &first, &last)) @@ -786,13 +789,6 @@ _format_tag (hb_tag_t tag, hb_vector_t &out) while (len > 0 && buf[len - 1] == ' ') len--; - if (len == 0) - { - static const char spaces[4] = {'_', '_', '_', '_'}; - out.extend (hb_bytes_t (spaces, 4)); - return; - } - for (unsigned i = 0; i < len; i++) { char c = buf[i]; @@ -836,16 +832,14 @@ _format_set_arg (const hb_set_t *set, Formatter &&formatter, hb_vector_t &sb) { - char opt_prefix[64]; - snprintf (opt_prefix, sizeof (opt_prefix), "--%s", opt_name); - if (hb_set_is_inverted (set)) { hb_set_t *excluded = hb_set_copy (set); hb_set_invert (excluded); hb_vector_t opt; - opt.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); + opt.extend (hb_bytes_t ("--", 2)); + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); opt.extend (hb_bytes_t ("=*", 2)); opt.push ('\0'); if (opt.arrayZ) _append_arg (sb, opt.arrayZ); @@ -857,7 +851,8 @@ _format_set_arg (const hb_set_t *set, if (formatted.length) { hb_vector_t opt2; - opt2.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); + opt2.extend (hb_bytes_t ("--", 2)); + opt2.extend (hb_bytes_t (opt_name, strlen (opt_name))); opt2.extend (hb_bytes_t ("-=", 2)); opt2.extend (formatted.as_array ()); opt2.push ('\0'); @@ -869,7 +864,8 @@ _format_set_arg (const hb_set_t *set, else if (hb_set_is_empty (set)) { hb_vector_t opt; - opt.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); + opt.extend (hb_bytes_t ("--", 2)); + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); opt.extend (hb_bytes_t ("-=*", 3)); opt.push ('\0'); if (opt.arrayZ) _append_arg (sb, opt.arrayZ); @@ -881,7 +877,8 @@ _format_set_arg (const hb_set_t *set, if (formatted.length) { hb_vector_t opt; - opt.extend (hb_bytes_t (opt_prefix, strlen (opt_prefix))); + opt.extend (hb_bytes_t ("--", 2)); + opt.extend (hb_bytes_t (opt_name, strlen (opt_name))); opt.extend (hb_bytes_t ("=", 1)); opt.extend (formatted.as_array ()); opt.push ('\0'); diff --git a/test/api/test-subset.c b/test/api/test-subset.c index 201c8562d..3e87328f2 100644 --- a/test/api/test-subset.c +++ b/test/api/test-subset.c @@ -585,12 +585,13 @@ test_subset_input_to_string (void) hb_set_t *features = hb_subset_input_set (input, HB_SUBSET_SETS_LAYOUT_FEATURE_TAG); hb_set_clear (features); hb_set_add (features, HB_TAG (' ', ' ', ' ', ' ')); + hb_set_add (features, HB_TAG ('f', 'o', 'o', ' ')); hb_blob_t *blob = hb_subset_input_to_string_or_fail (input); g_assert_nonnull (blob); unsigned len = 0; const char *data = hb_blob_get_data (blob, &len); - const char *expected = "--layout-features=____ --drop-tables=cvt"; + const char *expected = "--layout-features=,foo --drop-tables=cvt"; g_assert_cmpstr (data, ==, expected); hb_blob_destroy (blob); hb_subset_input_destroy (input); From af85ffc449edf34f426312856fa000c0351b5633 Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Wed, 15 Jul 2026 09:39:11 -0700 Subject: [PATCH 077/112] [subset] increase HB_MAX_FEATURE_INDICES limit to 8000 A realistic font file reaches 1512 feature indices, so increase the max limit --- src/hb-limits.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-limits.hh b/src/hb-limits.hh index a59091477..097024744 100644 --- a/src/hb-limits.hh +++ b/src/hb-limits.hh @@ -81,7 +81,7 @@ #endif #ifndef HB_MAX_FEATURE_INDICES -#define HB_MAX_FEATURE_INDICES 1500 +#define HB_MAX_FEATURE_INDICES 8000 #endif #ifndef HB_MAX_LOOKUP_VISIT_COUNT From f2ab271c1f65e820c85b1690d488918d4fad5b97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2026 10:13:47 +0000 Subject: [PATCH 078/112] Bump github/codeql-action/upload-sarif from 4.36.3 to 4.37.0 Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.36.3 to 4.37.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/54f647b7e1bb85c95cddabcd46b0c578ec92bc1a...99df26d4f13ea111d4ec1a7dddef6063f76b97e9) --- updated-dependencies: - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 64bb10f65..ac9bba591 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v3.29.5 + uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v3.29.5 with: sarif_file: results.sarif From 0577ee23cfb1f89f1c308abf8039ded85ecb3db6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2026 10:13:52 +0000 Subject: [PATCH 079/112] Bump meson from 1.11.1 to 1.11.2 in /.ci Bumps [meson](https://github.com/mesonbuild/meson) from 1.11.1 to 1.11.2. - [Release notes](https://github.com/mesonbuild/meson/releases) - [Commits](https://github.com/mesonbuild/meson/compare/1.11.1...1.11.2) --- updated-dependencies: - dependency-name: meson dependency-version: 1.11.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .ci/requirements.in | 2 +- .ci/requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/requirements.in b/.ci/requirements.in index b796847e1..5d21fe92b 100644 --- a/.ci/requirements.in +++ b/.ci/requirements.in @@ -1,4 +1,4 @@ -r requirements-fonttools.in -meson==1.11.1 +meson==1.11.2 ninja setuptools # https://github.com/harfbuzz/harfbuzz/issues/4475 diff --git a/.ci/requirements.txt b/.ci/requirements.txt index 3b47037e4..6ada8c3cf 100644 --- a/.ci/requirements.txt +++ b/.ci/requirements.txt @@ -106,9 +106,9 @@ fonttools==4.63.0 \ --hash=sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745 \ --hash=sha256:fd1e3094f42d806d3d7c79162fc59e5910fcbe3a7360c385b8da969bc4493745 # via -r requirements-fonttools.in -meson==1.11.1 \ - --hash=sha256:9b3a023657e393dbc5335b95c561337d49b7a458f5541e47ec44f2cc566e0d80 \ - --hash=sha256:9b3a023657e393dbc5335b95c561337d49b7a458f5541e47ec44f2cc566e0d80 +meson==1.11.2 \ + --hash=sha256:698feae069cef3ecd4d7aaf281d7df359bdfcf555a9a1564383d3b913fa8a736 \ + --hash=sha256:7e4f6e83fec83e3eaac928e058b073c7557b282c35b6a2024cea143a39926a39 # via -r requirements.in ninja==1.13.0 \ --hash=sha256:11be2d22027bde06f14c343f01d31446747dbb51e72d00decca2eb99be911e2f \ From 9de7e9d56396654b07649005cd2f4f494b2cdc4b Mon Sep 17 00:00:00 2001 From: Nussu06 Date: Fri, 17 Jul 2026 11:48:17 +0530 Subject: [PATCH 080/112] [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. --- src/hb-paint.hh | 2 +- test/api/test-paint.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/hb-paint.hh b/src/hb-paint.hh index f06bce45d..39135a536 100644 --- a/src/hb-paint.hh +++ b/src/hb-paint.hh @@ -93,7 +93,7 @@ struct hb_paint_funcs_t { return func.color_glyph (this, paint_data, glyph, font, - !user_data ? nullptr : user_data->push_clip_glyph); } + !user_data ? nullptr : user_data->color_glyph); } void push_clip_glyph (void *paint_data, hb_codepoint_t glyph, hb_font_t *font) diff --git a/test/api/test-paint.c b/test/api/test-paint.c index e63e26389..fb829c809 100644 --- a/test/api/test-paint.c +++ b/test/api/test-paint.c @@ -875,6 +875,42 @@ test_fill_glyph_nil_decomposes (void) hb_paint_funcs_destroy (funcs); } +static void *color_glyph_user_data_seen; + +static hb_bool_t +color_glyph_record_user_data (hb_paint_funcs_t *funcs HB_UNUSED, + void *paint_data HB_UNUSED, + hb_codepoint_t glyph HB_UNUSED, + hb_font_t *font HB_UNUSED, + void *user_data) +{ + color_glyph_user_data_seen = user_data; + return TRUE; +} + +/* Each callback must be handed the user_data it was registered with, + * not another callback's. */ +static void +test_color_glyph_user_data (void) +{ + char color_glyph_ctx = 0; + char push_clip_glyph_ctx = 0; + + hb_paint_funcs_t *funcs = hb_paint_funcs_create (); + hb_paint_funcs_set_color_glyph_func (funcs, color_glyph_record_user_data, + &color_glyph_ctx, NULL); + hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, + &push_clip_glyph_ctx, NULL); + hb_paint_funcs_make_immutable (funcs); + + color_glyph_user_data_seen = NULL; + hb_paint_color_glyph (funcs, NULL, 42, hb_font_get_empty ()); + + g_assert_true (color_glyph_user_data_seen == &color_glyph_ctx); + + hb_paint_funcs_destroy (funcs); +} + int main (int argc, char **argv) @@ -888,6 +924,7 @@ main (int argc, char **argv) hb_test_add (test_push_clip_path_nil_returns_null); hb_test_add (test_push_clip_path_round_trip); hb_test_add (test_fill_glyph_nil_decomposes); + hb_test_add (test_color_glyph_user_data); for (unsigned int i = 0; i < G_N_ELEMENTS (paint_tests); i++) { From 1737bce4567bb6c7b41ae16e4479c868709bec8e Mon Sep 17 00:00:00 2001 From: Nussu06 Date: Sat, 18 Jul 2026 12:27:22 +0530 Subject: [PATCH 081/112] [subset] bound cvar tuple data length in calculate_cvt_deltas --- src/hb-ot-var-cvar-table.hh | 13 +++++++++++-- .../037322204d9bc87b6b0b0f2342c97caa9c5fd479 | Bin 0 -> 12370 bytes 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/fuzzing/fonts/037322204d9bc87b6b0b0f2342c97caa9c5fd479 diff --git a/src/hb-ot-var-cvar-table.hh b/src/hb-ot-var-cvar-table.hh index 358a95539..1e7532bca 100644 --- a/src/hb-ot-var-cvar-table.hh +++ b/src/hb-ot-var-cvar-table.hh @@ -79,12 +79,12 @@ struct cvar unsigned num_cvt_item, const TupleVariationData<> *tuple_var_data, const void *base, + unsigned var_data_length, hb_vector_t& cvt_deltas /* OUT */) { if (!coords) return true; hb_vector_t shared_indices; TupleVariationData<>::tuple_iterator_t iterator; - unsigned var_data_length = tuple_var_data->get_size (axis_count * 2); hb_bytes_t var_data_bytes = hb_bytes_t (reinterpret_cast (tuple_var_data), var_data_length); if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, base, shared_indices, &iterator)) @@ -191,8 +191,17 @@ struct cvar return false; } + /* Bound the tuple variation data by the actual cvar table length rather + * than trusting tupleVarCount to walk the headers; an inflated count would + * otherwise run get_size() off the end of the table. */ + hb_blob_t *cvar_blob = hb_face_reference_table (plan->source, cvar::tableTag); + unsigned cvar_length = hb_blob_get_length (cvar_blob); + hb_blob_destroy (cvar_blob); + unsigned var_data_offset = (unsigned) ((const char *) tuple_var_data - (const char *) base); + unsigned var_data_length = var_data_offset < cvar_length ? cvar_length - var_data_offset : 0; + if (!calculate_cvt_deltas (plan->normalized_coords.length, plan->normalized_coords.as_array (), - num_cvt_item, tuple_var_data, base, cvt_deltas)) + num_cvt_item, tuple_var_data, base, var_data_length, cvt_deltas)) { hb_blob_destroy (cvt_prime_blob); return false; diff --git a/test/fuzzing/fonts/037322204d9bc87b6b0b0f2342c97caa9c5fd479 b/test/fuzzing/fonts/037322204d9bc87b6b0b0f2342c97caa9c5fd479 new file mode 100644 index 0000000000000000000000000000000000000000..1a2ca4cf5b00b4942b755098ed1c5d426e4dfa75 GIT binary patch literal 12370 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 Date: Thu, 16 Jul 2026 12:11:52 +0530 Subject: [PATCH 082/112] [gpu] Validate extents fit i16 before quantizing --- src/hb-gpu-draw.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/hb-gpu-draw.cc b/src/hb-gpu-draw.cc index a05996e2c..710b14552 100644 --- a/src/hb-gpu-draw.cc +++ b/src/hb-gpu-draw.cc @@ -446,6 +446,16 @@ hb_gpu_draw_encode (hb_gpu_draw_t *draw, if (unlikely (!s.curve_infos.resize (num_curves))) return nullptr; + /* Validate the extents fit in i16 before quantizing: the casts in + * quantize_down()/quantize_up() are undefined for out-of-range + * values, and every later i16 conversion of a curve point is bounded + * by these extents. */ + if (!quantize_down_fits_i16 (draw->ext_min_x) || + !quantize_down_fits_i16 (draw->ext_min_y) || + !quantize_up_fits_i16 (draw->ext_max_x) || + !quantize_up_fits_i16 (draw->ext_max_y)) + return nullptr; + int16_t min_x_q = quantize_down (draw->ext_min_x); int16_t min_y_q = quantize_down (draw->ext_min_y); int16_t max_x_q = quantize_up (draw->ext_max_x); @@ -653,12 +663,6 @@ hb_gpu_draw_encode (hb_gpu_draw_t *draw, if (total_len > (unsigned) UINT16_MAX + 1u) return nullptr; - if (!quantize_down_fits_i16 (draw->ext_min_x) || - !quantize_down_fits_i16 (draw->ext_min_y) || - !quantize_up_fits_i16 (draw->ext_max_x) || - !quantize_up_fits_i16 (draw->ext_max_y)) - return nullptr; - /* Allocate or reuse encode buffer */ unsigned needed_bytes; if (unlikely (hb_unsigned_mul_overflows (total_len, From 6fa49d36f0507e4386a39c547c7bd21c4bc42f7e Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 19 Jul 2026 21:57:23 +0300 Subject: [PATCH 083/112] [docs] Fix reference to non-existent hb_face_create_from_blob_or_fail --- src/hb-coretext.cc | 2 +- src/hb-directwrite.cc | 2 +- src/hb-ft.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 4eeb451cc..e257b8cee 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -447,7 +447,7 @@ hb_coretext_face_create_from_file_or_fail (const char *file_name, * Creates an #hb_face_t face object from the specified * blob and face index. * - * This is similar in functionality to hb_face_create_from_blob_or_fail(), + * This is similar in functionality to hb_face_create_or_fail(), * but uses the CoreText library for loading the font data. * * Return value: (transfer full): The new face object, or `NULL` if diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index d94104971..e2b16685c 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -315,7 +315,7 @@ hb_directwrite_face_create_from_file_or_fail (const char *file_name, * Creates an #hb_face_t face object from the specified * blob and face index. * - * This is similar in functionality to hb_face_create_from_blob_or_fail(), + * This is similar in functionality to hb_face_create_or_fail(), * but uses the DirectWrite library for loading the font data. * * Return value: (transfer full): The new face object, or `NULL` if diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 24557e584..df11ef3c5 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -1615,7 +1615,7 @@ _destroy_blob (void *p) * Creates an #hb_face_t face object from the specified * font blob and face index. * - * This is similar in functionality to hb_face_create_from_blob_or_fail(), + * This is similar in functionality to hb_face_create_or_fail(), * but uses the FreeType library for loading the font blob. This can * be useful, for example, to load WOFF and WOFF2 font data. * From 53d292f0d1d32b893a5770301c3263303706aefb Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 19 Jul 2026 21:06:47 +0300 Subject: [PATCH 084/112] [introspection] Fix introspection warnings Fixes https://github.com/harfbuzz/harfbuzz/issues/4875 --- src/hb-font.cc | 8 ++++---- src/hb-ft.cc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hb-font.cc b/src/hb-font.cc index 4b7bce99f..ecb148361 100644 --- a/src/hb-font.cc +++ b/src/hb-font.cc @@ -2498,9 +2498,9 @@ hb_font_get_face (hb_font_t *font) /** * hb_font_set_funcs: * @font: #hb_font_t to work upon - * @klass: (closure font_data) (destroy destroy) (scope notified): The font-functions structure. + * @klass: The font-functions structure. * @font_data: Data to attach to @font - * @destroy: (nullable): The function to call when @font_data is not needed anymore + * @destroy: (nullable) (scope async) (closure font_data): The function to call when @font_data is not needed anymore * * Replaces the font-functions structure attached to a font, updating * the font's user-data with @font-data and the @destroy callback. @@ -2538,8 +2538,8 @@ hb_font_set_funcs (hb_font_t *font, /** * hb_font_set_funcs_data: * @font: #hb_font_t to work upon - * @font_data: (destroy destroy) (scope notified): Data to attach to @font - * @destroy: (nullable): The function to call when @font_data is not needed anymore + * @font_data: Data to attach to @font + * @destroy: (nullable) (scope async) (closure font_data): The function to call when @font_data is not needed anymore * * Replaces the user data attached to a font, updating the font's * @destroy callback. diff --git a/src/hb-ft.cc b/src/hb-ft.cc index df11ef3c5..b8c0c8519 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -1182,8 +1182,8 @@ _hb_ft_get_table_tags (const hb_face_t *face HB_UNUSED, /** * hb_ft_face_create: - * @ft_face: (destroy destroy) (scope notified): FT_Face to work upon - * @destroy: (nullable): A callback to call when the face object is not needed anymore + * @ft_face: FT_Face to work upon + * @destroy: (nullable) (scope async): A callback to call when the face object is not needed anymore * * Creates an #hb_face_t face object from the specified FT_Face. * @@ -1306,8 +1306,8 @@ hb_ft_face_create_cached (FT_Face ft_face) /** * hb_ft_font_create: - * @ft_face: (destroy destroy) (scope notified): FT_Face to work upon - * @destroy: (nullable): A callback to call when the font object is not needed anymore + * @ft_face: FT_Face to work upon + * @destroy: (nullable) (scope async): A callback to call when the font object is not needed anymore * * Creates an #hb_font_t font object from the specified FT_Face. * From 3372624c66a19a04f91e8c22b391bbe827728ab9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 10:11:37 +0000 Subject: [PATCH 085/112] Bump github/codeql-action/upload-sarif from 4.37.0 to 4.37.1 Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.37.0 to 4.37.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/99df26d4f13ea111d4ec1a7dddef6063f76b97e9...7188fc363630916deb702c7fdcf4e481b751f97a) --- updated-dependencies: - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.37.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index ac9bba591..ff4ebcfce 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v3.29.5 + uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v3.29.5 with: sarif_file: results.sarif From ac9227e0a234add05f21907ed1cfe25ecaab7c7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2026 10:11:43 +0000 Subject: [PATCH 086/112] Bump actions/setup-python from 6.3.0 to 7.0.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6.3.0 to 7.0.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/ece7cb06caefa5fff74198d8649806c4678c61a1...5fda3b95a4ea91299a34e894583c3862153e4b97) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/crossbuild-mingw.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/rust.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/crossbuild-mingw.yml b/.github/workflows/crossbuild-mingw.yml index 463be41bf..2090c1c9b 100644 --- a/.github/workflows/crossbuild-mingw.yml +++ b/.github/workflows/crossbuild-mingw.yml @@ -38,7 +38,7 @@ jobs: zip \ ${{ matrix.PACKAGES }} - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ce3d497e3..e6c3e84e0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -43,7 +43,7 @@ jobs: with: version: latest - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index aafa4207c..b8186348d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ jobs: zlib1g-dev \ help2man - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a47334e8d..b2717116c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,7 @@ jobs: ninja \ pkgconf - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 026d53595..1c0f592cb 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -34,7 +34,7 @@ jobs: variant: sccache key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.ARCH }} - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Setup MSVC diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fe9de1b56..5fdf4f158 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -45,7 +45,7 @@ jobs: zlib1g-dev \ bindgen - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index a7dd5d3c3..42d8bd91e 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -50,7 +50,7 @@ jobs: libicu-dev \ libgraphite2-dev - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 91a34d00e..ed7efac40 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -31,7 +31,7 @@ jobs: libicu-dev \ libgraphite2-dev - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.12' - name: Install Python Dependencies From 0b590d6b54aa19b57f643a5f644998adc450a1b0 Mon Sep 17 00:00:00 2001 From: Qunxin Liu <48925186+qxliu76@users.noreply.github.com> Date: Tue, 21 Jul 2026 09:55:43 -0700 Subject: [PATCH 087/112] [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. --- src/graph/classdef-graph.hh | 6 +- src/graph/coverage-graph.hh | 6 +- src/graph/graph.hh | 150 +++++++++--------- src/graph/gsubgpos-graph.hh | 4 +- src/graph/ligature-graph.hh | 40 ++--- src/graph/markbasepos-graph.hh | 12 +- src/graph/pairpos-graph.hh | 6 +- src/graph/serialize.hh | 7 +- src/test-repacker.cc | 4 +- test/subset/data/fonts/bad-gsub.otf | Bin 0 -> 126580 bytes .../duplicate_before_mutation.tests | 31 ++++ test/subset/meson.build | 1 + 12 files changed, 141 insertions(+), 126 deletions(-) create mode 100644 test/subset/data/fonts/bad-gsub.otf create mode 100644 test/subset/data/repack_tests/duplicate_before_mutation.tests diff --git a/src/graph/classdef-graph.hh b/src/graph/classdef-graph.hh index df06e00e7..fa604c90e 100644 --- a/src/graph/classdef-graph.hh +++ b/src/graph/classdef-graph.hh @@ -34,7 +34,7 @@ namespace graph { struct ClassDefFormat1 : public OT::ClassDefFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::ClassDefFormat1_3::min_size; @@ -46,7 +46,7 @@ struct ClassDefFormat1 : public OT::ClassDefFormat1_3 struct ClassDefFormat2 : public OT::ClassDefFormat2_4 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::ClassDefFormat2_4::min_size; @@ -112,7 +112,7 @@ struct ClassDef : public OT::ClassDef return true; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::ClassDef::min_size) return false; diff --git a/src/graph/coverage-graph.hh b/src/graph/coverage-graph.hh index 5778ee9e1..457aab771 100644 --- a/src/graph/coverage-graph.hh +++ b/src/graph/coverage-graph.hh @@ -34,7 +34,7 @@ namespace graph { static bool sanitize ( const OT::Layout::Common::CoverageFormat1_3* thiz, - graph_t::vertex_t& vertex + const graph_t::vertex_t& vertex ) { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3::min_size; @@ -45,7 +45,7 @@ static bool sanitize ( static bool sanitize ( const OT::Layout::Common::CoverageFormat2_4* thiz, - graph_t::vertex_t& vertex + const graph_t::vertex_t& vertex ) { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4::min_size; @@ -156,7 +156,7 @@ struct Coverage : public OT::Layout::Common::Coverage return true; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Layout::Common::Coverage::min_size) return false; diff --git a/src/graph/graph.hh b/src/graph/graph.hh index 7dc633afc..291bfc745 100644 --- a/src/graph/graph.hh +++ b/src/graph/graph.hh @@ -52,6 +52,7 @@ struct graph_t unsigned single_parent = (unsigned) -1; bool has_incoming_virtual_edges_ = false; hb_hashmap_t parents; + hb_set_t virtual_parents; public: auto parents_iter () const HB_AUTO_RETURN @@ -64,7 +65,7 @@ struct graph_t bool in_error () const { - return parents.in_error (); + return parents.in_error () || virtual_parents.in_error (); } bool has_incoming_virtual_edges () const @@ -171,6 +172,7 @@ struct graph_t hb_swap (a.space, b.space); hb_swap (a.single_parent, b.single_parent); hb_swap (a.parents, b.parents); + hb_swap (a.virtual_parents, b.virtual_parents); hb_swap (a.incoming_edges_, b.incoming_edges_); hb_swap (a.has_incoming_virtual_edges_, b.has_incoming_virtual_edges_); hb_swap (a.start, b.start); @@ -193,7 +195,7 @@ struct graph_t bool is_shared () const { - return parents.get_population () > 1; + return parents.get_population () > virtual_parents.get_population () + 1; } unsigned incoming_edges () const @@ -221,12 +223,15 @@ struct graph_t has_incoming_virtual_edges_ = false; single_parent = (unsigned) -1; parents.reset (); + virtual_parents.reset (); } void add_parent (unsigned parent_index, bool is_virtual) { assert (parent_index != (unsigned) -1); has_incoming_virtual_edges_ |= is_virtual; + if (is_virtual) + virtual_parents.add (parent_index); if (incoming_edges_ == 0) { @@ -258,6 +263,7 @@ struct graph_t { single_parent = (unsigned) -1; incoming_edges_--; + virtual_parents.reset (); return; } @@ -268,7 +274,10 @@ struct graph_t if (*v > 1) (*v)--; else + { parents.del (parent_index); + virtual_parents.del (parent_index); + } if (incoming_edges_ == 1) { @@ -295,37 +304,19 @@ struct graph_t } } - bool remap_parents (const hb_vector_t& id_map) - { - if (single_parent != (unsigned) -1) - { - assert (single_parent < id_map.length); - single_parent = id_map[single_parent]; - return true; - } - - hb_hashmap_t new_parents; - new_parents.alloc (parents.get_population ()); - for (auto _ : parents) - { - assert (_.first < id_map.length); - assert (!new_parents.has (id_map[_.first])); - new_parents.set (id_map[_.first], _.second); - } - - if (parents.in_error() || new_parents.in_error ()) - return false; - - parents = std::move (new_parents); - return true; - } - void remap_parent (unsigned old_index, unsigned new_index) { if (single_parent != (unsigned) -1) { if (single_parent == old_index) + { single_parent = new_index; + if (virtual_parents.has (old_index)) + { + virtual_parents.del (old_index); + virtual_parents.add (new_index); + } + } return; } @@ -343,6 +334,12 @@ struct graph_t parents.reset (); } } + + if (virtual_parents.has (old_index)) + { + virtual_parents.del (old_index); + virtual_parents.add (new_index); + } } bool is_leaf () const @@ -437,19 +434,29 @@ struct graph_t } }; - template + enum vertex_mutability_t + { + Immutable, + Mutable + }; + + template struct vertex_and_table_t { vertex_and_table_t () : index (0), vertex (nullptr), table (nullptr) {} - unsigned index; - vertex_t* vertex; - T* table; + template + vertex_and_table_t (const vertex_and_table_t& o) + : index (o.index), vertex (o.vertex), table (o.table) + {} - operator bool () { - return table && vertex; - } + unsigned index; + typename std::conditional::type vertex; + typename std::conditional::type table; + + operator bool () const + { return table && vertex; } }; /* @@ -712,32 +719,32 @@ struct graph_t } template - vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) + const vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) { return as_table_from_index (index_for_offset (parent, offset), std::forward(ds)...); } template - vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) + vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) { - return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); + return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); } - template - vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) + template + vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) { if (index >= vertices_.length) - return vertex_and_table_t (); + return vertex_and_table_t (); - vertex_and_table_t r; - r.vertex = &vertices_[index]; - r.table = (T*) r.vertex->obj.head; + vertex_and_table_t r; + r.vertex = (typename std::conditional::type) &vertices_[index]; + r.table = (typename std::conditional::type) r.vertex->obj.head; r.index = index; if (!r.table) - return vertex_and_table_t (); + return vertex_and_table_t (); if (!r.table->sanitize (*(r.vertex), std::forward(ds)...)) - return vertex_and_table_t (); + return vertex_and_table_t (); return r; } @@ -773,7 +780,7 @@ struct graph_t for (unsigned p : child.parents_iter ()) { if (p != node_idx) { - return duplicate (node_idx, child_idx); + return duplicate (node_idx, child_idx, true); } } @@ -1065,7 +1072,7 @@ struct graph_t /* * Creates a copy of node_idx and returns it's new index. */ - unsigned duplicate (unsigned node_idx) + unsigned duplicate (unsigned node_idx, bool copy_table = false) { if (vertices_.length >= HB_REPACKER_MAX_VERTICES) { @@ -1085,8 +1092,24 @@ struct graph_t return -1; } - clone->obj.head = child.obj.head; - clone->obj.tail = child.obj.tail; + unsigned table_size = child.obj.tail - child.obj.head; + if (copy_table && table_size) + { + char* buffer = (char*) hb_malloc (table_size); + if (!check_success (buffer && add_buffer (buffer))) + { + hb_free (buffer); + return -1; + } + hb_memcpy (buffer, child.obj.head, table_size); + clone->obj.head = buffer; + clone->obj.tail = buffer + table_size; + } + else + { + clone->obj.head = child.obj.head; + clone->obj.tail = child.obj.tail; + } clone->distance = child.distance; clone->space = child.space; clone->reset_parents (); @@ -1118,7 +1141,7 @@ struct graph_t * If the child_idx only has incoming edges from parent_idx, * duplication isn't possible and this will return -1. */ - unsigned duplicate (unsigned parent_idx, unsigned child_idx) + unsigned duplicate (unsigned parent_idx, unsigned child_idx, bool copy_table = false) { update_parents (); @@ -1142,7 +1165,7 @@ struct graph_t DEBUG_MSG (SUBSET_REPACK, nullptr, " Duplicating %u => %u", parent_idx, child_idx); - unsigned clone_idx = duplicate (child_idx); + unsigned clone_idx = duplicate (child_idx, copy_table); if (clone_idx == (unsigned) -1) return -1; // duplicate shifts the root node idx, so if parent_idx was root update it. if (parent_idx == clone_idx) parent_idx++; @@ -1285,31 +1308,6 @@ struct graph_t return new_child_idx; } - /* - * Creates a new child node and remap the old child at specified position to it. - * - * Returns the index of the newly created child. - * - */ - unsigned remap_child_at_position (unsigned parent_idx, unsigned old_child_idx, const void* offset) - { - const auto& parent = object (parent_idx); - if (!offset || offset < parent.head || offset >= parent.tail) return -1; - - for (auto& l : parent.real_links) - { - if (l.objidx != old_child_idx || offset != parent.head + l.position) - continue; - - unsigned new_child_idx = duplicate (old_child_idx); - if (new_child_idx == (unsigned) -1) return -1; - reassign_link (l, parent_idx, new_child_idx, false); - return new_child_idx; - } - - return -1; - } - /* * Raises the sorting priority of all children. */ diff --git a/src/graph/gsubgpos-graph.hh b/src/graph/gsubgpos-graph.hh index 73f4b1566..6cbea4703 100644 --- a/src/graph/gsubgpos-graph.hh +++ b/src/graph/gsubgpos-graph.hh @@ -50,7 +50,7 @@ struct ExtensionFormat1 : public OT::ExtensionFormat1 this->extensionOffset = 0; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; return vertex_len >= OT::ExtensionFormat1::static_size; @@ -74,7 +74,7 @@ struct Lookup : public OT::Lookup return subTable.len; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Lookup::min_size) return false; diff --git a/src/graph/ligature-graph.hh b/src/graph/ligature-graph.hh index cfcd11f27..2a0f485ff 100644 --- a/src/graph/ligature-graph.hh +++ b/src/graph/ligature-graph.hh @@ -1,3 +1,4 @@ + /* * Copyright © 2025 Google, Inc. * @@ -39,7 +40,7 @@ namespace graph { struct LigatureSet : public OT::Layout::GSUB_impl::LigatureSet { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Layout::GSUB_impl::LigatureSet::min_size) return false; @@ -55,7 +56,7 @@ struct LigatureSet : public OT::Layout::GSUB_impl::LigatureSet struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1_2 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = OT::Layout::GSUB_impl::LigatureSubstFormat1_2::min_size; @@ -70,7 +71,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 unsigned this_index) { auto split_points = compute_split_points(c, this_index); - if (!split_points || !duplicate_shared_liga_sets(c, this_index)) + if (!split_points) return hb_vector_t (); split_context_t split_context { @@ -107,7 +108,8 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 return result; } - hb_vector_t ligature_index_to_object_id(const graph_t::vertex_and_table_t& liga_set) const { + template + hb_vector_t ligature_index_to_object_id(const graph_t::vertex_and_table_t& liga_set) const { hb_vector_t map; map.resize_exact(liga_set.table->ligature.len); if (map.in_error()) return map; @@ -124,28 +126,6 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 return map; } - bool duplicate_shared_liga_sets(gsubgpos_graph_context_t& c, unsigned this_index) const - { - hb_set_t visited; - for (unsigned i = 0; i < ligatureSet.len; i++) - { - auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); - if (!liga_set.table) return false; - - unsigned liga_set_index = liga_set.index; - if (visited.has (liga_set_index)) - { - unsigned new_index = c.graph.remap_child_at_position (this_index, liga_set_index, &ligatureSet[i]); - if (new_index == (unsigned) -1) return false; - } - else - { - visited.add (liga_set_index); - } - } - return true; - } - hb_vector_t compute_split_points(gsubgpos_graph_context_t& c, unsigned this_index) const { @@ -342,12 +322,12 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 continue; } - auto liga_set_index = c.graph.index_for_offset(this_index, &ligatureSet[i]); - auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); + auto liga_set = c.graph.as_mutable_table(this_index, &ligatureSet[i]); if (!liga_set.table) { return -1; } + unsigned liga_set_index = liga_set.index; // Bounds may need to be adjusted if some ligas have been previously removed. hb_pair_t liga_bounds = current_liga_set_bounds(c, liga_set_index, liga_set.vertex->obj); current_start = hb_max(count + liga_bounds.first, current_start); @@ -428,7 +408,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 unsigned new_liga_set_count = 0; for (unsigned i = 0; i < liga_counts.length; i++) { - auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); + auto liga_set = c.graph.as_mutable_table(this_index, &ligatureSet[i]); if (!liga_set.table) { return false; } @@ -515,7 +495,7 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst } } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/markbasepos-graph.hh b/src/graph/markbasepos-graph.hh index a653f402a..a06ad277c 100644 --- a/src/graph/markbasepos-graph.hh +++ b/src/graph/markbasepos-graph.hh @@ -36,7 +36,7 @@ namespace graph { struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix { - bool sanitize (graph_t::vertex_t& vertex, unsigned class_count) const + bool sanitize (const graph_t::vertex_t& vertex, unsigned class_count) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < AnchorMatrix::min_size) return false; @@ -124,7 +124,7 @@ struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix struct MarkArray : public OT::Layout::GPOS_impl::MarkArray { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = MarkArray::min_size; @@ -205,7 +205,7 @@ struct MarkArray : public OT::Layout::GPOS_impl::MarkArray struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; return vertex_len >= MarkBasePosFormat1::static_size; @@ -448,7 +448,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (sc.this_index, &markArray); + graph.as_mutable_table (sc.this_index, &markArray); if (!mark_array) return -1; unsigned new_mark_array = mark_array.table->clone (sc.c, @@ -460,7 +460,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (sc.this_index, &baseArray, class_count); + graph.as_mutable_table (sc.this_index, &baseArray, class_count); if (!base_array) return -1; unsigned new_base_array = base_array.table->clone (sc.c, @@ -490,7 +490,7 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos } } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/pairpos-graph.hh b/src/graph/pairpos-graph.hh index 7c3b04819..5f9915bd9 100644 --- a/src/graph/pairpos-graph.hh +++ b/src/graph/pairpos-graph.hh @@ -37,7 +37,7 @@ namespace graph { struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat1_3::min_size; @@ -193,7 +193,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.table_size (); unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat2_4::min_size; @@ -621,7 +621,7 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos } } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/serialize.hh b/src/graph/serialize.hh index 4f89f1011..4ad4b0b06 100644 --- a/src/graph/serialize.hh +++ b/src/graph/serialize.hh @@ -176,7 +176,12 @@ serialize_link_of_type (const hb_serialize_context_t::object_t::link_t& link, const hb_vector_t& id_map, hb_serialize_context_t* c) { - assert(link.position + link.width <= size); + // A link must never write outside the bounds of its parent object. + if (unlikely (link.position + link.width > size)) + { + c->err (HB_SERIALIZE_ERROR_OTHER); + return; + } OT::Offset* offset = reinterpret_cast*> (head + link.position); *offset = 0; diff --git a/src/test-repacker.cc b/src/test-repacker.cc index fa8721016..50cbcd642 100644 --- a/src/test-repacker.cc +++ b/src/test-repacker.cc @@ -1939,7 +1939,7 @@ static void test_duplicate_leaf () populate_serializer_complex_2 (&a); graph_t graph (a.object_graph ()); - graph.duplicate (4, 1); + graph.duplicate (4, 1, false); graph.normalize(); e.start_serialize(); @@ -1979,7 +1979,7 @@ static void test_duplicate_interior () populate_serializer_complex_3 (&c); graph_t graph (c.object_graph ()); - graph.duplicate (3, 2); + graph.duplicate (3, 2, false); hb_always_assert(strncmp (graph.object (6).head, "jkl", 3) == 0); hb_always_assert(graph.object (6).real_links.length == 1); diff --git a/test/subset/data/fonts/bad-gsub.otf b/test/subset/data/fonts/bad-gsub.otf new file mode 100644 index 0000000000000000000000000000000000000000..27ed30b54bfa0aedd7b8ead8796ae9e55b56194c GIT binary patch literal 126580 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/repack_tests/duplicate_before_mutation.tests b/test/subset/data/repack_tests/duplicate_before_mutation.tests new file mode 100644 index 000000000..79e019c86 --- /dev/null +++ b/test/subset/data/repack_tests/duplicate_before_mutation.tests @@ -0,0 +1,31 @@ +bad-gsub.otf +U+0061 +U+0062 +U+0063 +U+0064 +U+0065 +U+0066 +U+0067 +U+0068 +U+0069 +U+006A +U+006B +U+006C +U+006D +U+006E +U+006F +U+0070 +U+0071 +U+0072 +U+0073 +U+0074 +U+0075 +U+0076 +U+0077 +U+0078 +U+0079 +U+007A +U+007B +U+007C +U+007D + diff --git a/test/subset/meson.build b/test/subset/meson.build index 82fc425a8..e174de892 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -104,6 +104,7 @@ repack_tests = [ 'isolation', 'advanced_prioritization', 'space_splitting', + 'duplicate_before_mutation', ] run_test = find_program('run-tests.py') From fc85680fec3968658539c0bfaac28e38857d0f76 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 21 Jul 2026 10:59:48 -0600 Subject: [PATCH 088/112] Revert "[subset-repack] bug fixes (#6077)" This reverts commit 0b590d6b54aa19b57f643a5f644998adc450a1b0. --- src/graph/classdef-graph.hh | 6 +- src/graph/coverage-graph.hh | 6 +- src/graph/graph.hh | 148 +++++++++--------- src/graph/gsubgpos-graph.hh | 4 +- src/graph/ligature-graph.hh | 40 +++-- src/graph/markbasepos-graph.hh | 12 +- src/graph/pairpos-graph.hh | 6 +- src/graph/serialize.hh | 7 +- src/test-repacker.cc | 4 +- test/subset/data/fonts/bad-gsub.otf | Bin 126580 -> 0 bytes .../duplicate_before_mutation.tests | 31 ---- test/subset/meson.build | 1 - 12 files changed, 125 insertions(+), 140 deletions(-) delete mode 100644 test/subset/data/fonts/bad-gsub.otf delete mode 100644 test/subset/data/repack_tests/duplicate_before_mutation.tests diff --git a/src/graph/classdef-graph.hh b/src/graph/classdef-graph.hh index fa604c90e..df06e00e7 100644 --- a/src/graph/classdef-graph.hh +++ b/src/graph/classdef-graph.hh @@ -34,7 +34,7 @@ namespace graph { struct ClassDefFormat1 : public OT::ClassDefFormat1_3 { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::ClassDefFormat1_3::min_size; @@ -46,7 +46,7 @@ struct ClassDefFormat1 : public OT::ClassDefFormat1_3 struct ClassDefFormat2 : public OT::ClassDefFormat2_4 { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::ClassDefFormat2_4::min_size; @@ -112,7 +112,7 @@ struct ClassDef : public OT::ClassDef return true; } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::ClassDef::min_size) return false; diff --git a/src/graph/coverage-graph.hh b/src/graph/coverage-graph.hh index 457aab771..5778ee9e1 100644 --- a/src/graph/coverage-graph.hh +++ b/src/graph/coverage-graph.hh @@ -34,7 +34,7 @@ namespace graph { static bool sanitize ( const OT::Layout::Common::CoverageFormat1_3* thiz, - const graph_t::vertex_t& vertex + graph_t::vertex_t& vertex ) { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3::min_size; @@ -45,7 +45,7 @@ static bool sanitize ( static bool sanitize ( const OT::Layout::Common::CoverageFormat2_4* thiz, - const graph_t::vertex_t& vertex + graph_t::vertex_t& vertex ) { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4::min_size; @@ -156,7 +156,7 @@ struct Coverage : public OT::Layout::Common::Coverage return true; } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Layout::Common::Coverage::min_size) return false; diff --git a/src/graph/graph.hh b/src/graph/graph.hh index 291bfc745..7dc633afc 100644 --- a/src/graph/graph.hh +++ b/src/graph/graph.hh @@ -52,7 +52,6 @@ struct graph_t unsigned single_parent = (unsigned) -1; bool has_incoming_virtual_edges_ = false; hb_hashmap_t parents; - hb_set_t virtual_parents; public: auto parents_iter () const HB_AUTO_RETURN @@ -65,7 +64,7 @@ struct graph_t bool in_error () const { - return parents.in_error () || virtual_parents.in_error (); + return parents.in_error (); } bool has_incoming_virtual_edges () const @@ -172,7 +171,6 @@ struct graph_t hb_swap (a.space, b.space); hb_swap (a.single_parent, b.single_parent); hb_swap (a.parents, b.parents); - hb_swap (a.virtual_parents, b.virtual_parents); hb_swap (a.incoming_edges_, b.incoming_edges_); hb_swap (a.has_incoming_virtual_edges_, b.has_incoming_virtual_edges_); hb_swap (a.start, b.start); @@ -195,7 +193,7 @@ struct graph_t bool is_shared () const { - return parents.get_population () > virtual_parents.get_population () + 1; + return parents.get_population () > 1; } unsigned incoming_edges () const @@ -223,15 +221,12 @@ struct graph_t has_incoming_virtual_edges_ = false; single_parent = (unsigned) -1; parents.reset (); - virtual_parents.reset (); } void add_parent (unsigned parent_index, bool is_virtual) { assert (parent_index != (unsigned) -1); has_incoming_virtual_edges_ |= is_virtual; - if (is_virtual) - virtual_parents.add (parent_index); if (incoming_edges_ == 0) { @@ -263,7 +258,6 @@ struct graph_t { single_parent = (unsigned) -1; incoming_edges_--; - virtual_parents.reset (); return; } @@ -274,10 +268,7 @@ struct graph_t if (*v > 1) (*v)--; else - { parents.del (parent_index); - virtual_parents.del (parent_index); - } if (incoming_edges_ == 1) { @@ -304,19 +295,37 @@ struct graph_t } } + bool remap_parents (const hb_vector_t& id_map) + { + if (single_parent != (unsigned) -1) + { + assert (single_parent < id_map.length); + single_parent = id_map[single_parent]; + return true; + } + + hb_hashmap_t new_parents; + new_parents.alloc (parents.get_population ()); + for (auto _ : parents) + { + assert (_.first < id_map.length); + assert (!new_parents.has (id_map[_.first])); + new_parents.set (id_map[_.first], _.second); + } + + if (parents.in_error() || new_parents.in_error ()) + return false; + + parents = std::move (new_parents); + return true; + } + void remap_parent (unsigned old_index, unsigned new_index) { if (single_parent != (unsigned) -1) { if (single_parent == old_index) - { single_parent = new_index; - if (virtual_parents.has (old_index)) - { - virtual_parents.del (old_index); - virtual_parents.add (new_index); - } - } return; } @@ -334,12 +343,6 @@ struct graph_t parents.reset (); } } - - if (virtual_parents.has (old_index)) - { - virtual_parents.del (old_index); - virtual_parents.add (new_index); - } } bool is_leaf () const @@ -434,29 +437,19 @@ struct graph_t } }; - enum vertex_mutability_t - { - Immutable, - Mutable - }; - - template + template struct vertex_and_table_t { vertex_and_table_t () : index (0), vertex (nullptr), table (nullptr) {} - template - vertex_and_table_t (const vertex_and_table_t& o) - : index (o.index), vertex (o.vertex), table (o.table) - {} - unsigned index; - typename std::conditional::type vertex; - typename std::conditional::type table; + vertex_t* vertex; + T* table; - operator bool () const - { return table && vertex; } + operator bool () { + return table && vertex; + } }; /* @@ -719,32 +712,32 @@ struct graph_t } template - const vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) + vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) { return as_table_from_index (index_for_offset (parent, offset), std::forward(ds)...); } template - vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) + vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) { - return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); + return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); } - template - vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) + template + vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) { if (index >= vertices_.length) - return vertex_and_table_t (); + return vertex_and_table_t (); - vertex_and_table_t r; - r.vertex = (typename std::conditional::type) &vertices_[index]; - r.table = (typename std::conditional::type) r.vertex->obj.head; + vertex_and_table_t r; + r.vertex = &vertices_[index]; + r.table = (T*) r.vertex->obj.head; r.index = index; if (!r.table) - return vertex_and_table_t (); + return vertex_and_table_t (); if (!r.table->sanitize (*(r.vertex), std::forward(ds)...)) - return vertex_and_table_t (); + return vertex_and_table_t (); return r; } @@ -780,7 +773,7 @@ struct graph_t for (unsigned p : child.parents_iter ()) { if (p != node_idx) { - return duplicate (node_idx, child_idx, true); + return duplicate (node_idx, child_idx); } } @@ -1072,7 +1065,7 @@ struct graph_t /* * Creates a copy of node_idx and returns it's new index. */ - unsigned duplicate (unsigned node_idx, bool copy_table = false) + unsigned duplicate (unsigned node_idx) { if (vertices_.length >= HB_REPACKER_MAX_VERTICES) { @@ -1092,24 +1085,8 @@ struct graph_t return -1; } - unsigned table_size = child.obj.tail - child.obj.head; - if (copy_table && table_size) - { - char* buffer = (char*) hb_malloc (table_size); - if (!check_success (buffer && add_buffer (buffer))) - { - hb_free (buffer); - return -1; - } - hb_memcpy (buffer, child.obj.head, table_size); - clone->obj.head = buffer; - clone->obj.tail = buffer + table_size; - } - else - { - clone->obj.head = child.obj.head; - clone->obj.tail = child.obj.tail; - } + clone->obj.head = child.obj.head; + clone->obj.tail = child.obj.tail; clone->distance = child.distance; clone->space = child.space; clone->reset_parents (); @@ -1141,7 +1118,7 @@ struct graph_t * If the child_idx only has incoming edges from parent_idx, * duplication isn't possible and this will return -1. */ - unsigned duplicate (unsigned parent_idx, unsigned child_idx, bool copy_table = false) + unsigned duplicate (unsigned parent_idx, unsigned child_idx) { update_parents (); @@ -1165,7 +1142,7 @@ struct graph_t DEBUG_MSG (SUBSET_REPACK, nullptr, " Duplicating %u => %u", parent_idx, child_idx); - unsigned clone_idx = duplicate (child_idx, copy_table); + unsigned clone_idx = duplicate (child_idx); if (clone_idx == (unsigned) -1) return -1; // duplicate shifts the root node idx, so if parent_idx was root update it. if (parent_idx == clone_idx) parent_idx++; @@ -1308,6 +1285,31 @@ struct graph_t return new_child_idx; } + /* + * Creates a new child node and remap the old child at specified position to it. + * + * Returns the index of the newly created child. + * + */ + unsigned remap_child_at_position (unsigned parent_idx, unsigned old_child_idx, const void* offset) + { + const auto& parent = object (parent_idx); + if (!offset || offset < parent.head || offset >= parent.tail) return -1; + + for (auto& l : parent.real_links) + { + if (l.objidx != old_child_idx || offset != parent.head + l.position) + continue; + + unsigned new_child_idx = duplicate (old_child_idx); + if (new_child_idx == (unsigned) -1) return -1; + reassign_link (l, parent_idx, new_child_idx, false); + return new_child_idx; + } + + return -1; + } + /* * Raises the sorting priority of all children. */ diff --git a/src/graph/gsubgpos-graph.hh b/src/graph/gsubgpos-graph.hh index 6cbea4703..73f4b1566 100644 --- a/src/graph/gsubgpos-graph.hh +++ b/src/graph/gsubgpos-graph.hh @@ -50,7 +50,7 @@ struct ExtensionFormat1 : public OT::ExtensionFormat1 this->extensionOffset = 0; } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; return vertex_len >= OT::ExtensionFormat1::static_size; @@ -74,7 +74,7 @@ struct Lookup : public OT::Lookup return subTable.len; } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Lookup::min_size) return false; diff --git a/src/graph/ligature-graph.hh b/src/graph/ligature-graph.hh index 2a0f485ff..cfcd11f27 100644 --- a/src/graph/ligature-graph.hh +++ b/src/graph/ligature-graph.hh @@ -1,4 +1,3 @@ - /* * Copyright © 2025 Google, Inc. * @@ -40,7 +39,7 @@ namespace graph { struct LigatureSet : public OT::Layout::GSUB_impl::LigatureSet { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Layout::GSUB_impl::LigatureSet::min_size) return false; @@ -56,7 +55,7 @@ struct LigatureSet : public OT::Layout::GSUB_impl::LigatureSet struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1_2 { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = OT::Layout::GSUB_impl::LigatureSubstFormat1_2::min_size; @@ -71,7 +70,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 unsigned this_index) { auto split_points = compute_split_points(c, this_index); - if (!split_points) + if (!split_points || !duplicate_shared_liga_sets(c, this_index)) return hb_vector_t (); split_context_t split_context { @@ -108,8 +107,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 return result; } - template - hb_vector_t ligature_index_to_object_id(const graph_t::vertex_and_table_t& liga_set) const { + hb_vector_t ligature_index_to_object_id(const graph_t::vertex_and_table_t& liga_set) const { hb_vector_t map; map.resize_exact(liga_set.table->ligature.len); if (map.in_error()) return map; @@ -126,6 +124,28 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 return map; } + bool duplicate_shared_liga_sets(gsubgpos_graph_context_t& c, unsigned this_index) const + { + hb_set_t visited; + for (unsigned i = 0; i < ligatureSet.len; i++) + { + auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); + if (!liga_set.table) return false; + + unsigned liga_set_index = liga_set.index; + if (visited.has (liga_set_index)) + { + unsigned new_index = c.graph.remap_child_at_position (this_index, liga_set_index, &ligatureSet[i]); + if (new_index == (unsigned) -1) return false; + } + else + { + visited.add (liga_set_index); + } + } + return true; + } + hb_vector_t compute_split_points(gsubgpos_graph_context_t& c, unsigned this_index) const { @@ -322,12 +342,12 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 continue; } - auto liga_set = c.graph.as_mutable_table(this_index, &ligatureSet[i]); + auto liga_set_index = c.graph.index_for_offset(this_index, &ligatureSet[i]); + auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); if (!liga_set.table) { return -1; } - unsigned liga_set_index = liga_set.index; // Bounds may need to be adjusted if some ligas have been previously removed. hb_pair_t liga_bounds = current_liga_set_bounds(c, liga_set_index, liga_set.vertex->obj); current_start = hb_max(count + liga_bounds.first, current_start); @@ -408,7 +428,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 unsigned new_liga_set_count = 0; for (unsigned i = 0; i < liga_counts.length; i++) { - auto liga_set = c.graph.as_mutable_table(this_index, &ligatureSet[i]); + auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); if (!liga_set.table) { return false; } @@ -495,7 +515,7 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst } } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/markbasepos-graph.hh b/src/graph/markbasepos-graph.hh index a06ad277c..a653f402a 100644 --- a/src/graph/markbasepos-graph.hh +++ b/src/graph/markbasepos-graph.hh @@ -36,7 +36,7 @@ namespace graph { struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix { - bool sanitize (const graph_t::vertex_t& vertex, unsigned class_count) const + bool sanitize (graph_t::vertex_t& vertex, unsigned class_count) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < AnchorMatrix::min_size) return false; @@ -124,7 +124,7 @@ struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix struct MarkArray : public OT::Layout::GPOS_impl::MarkArray { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = MarkArray::min_size; @@ -205,7 +205,7 @@ struct MarkArray : public OT::Layout::GPOS_impl::MarkArray struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; return vertex_len >= MarkBasePosFormat1::static_size; @@ -448,7 +448,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (sc.this_index, &markArray); + graph.as_table (sc.this_index, &markArray); if (!mark_array) return -1; unsigned new_mark_array = mark_array.table->clone (sc.c, @@ -460,7 +460,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (sc.this_index, &baseArray, class_count); + graph.as_table (sc.this_index, &baseArray, class_count); if (!base_array) return -1; unsigned new_base_array = base_array.table->clone (sc.c, @@ -490,7 +490,7 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos } } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/pairpos-graph.hh b/src/graph/pairpos-graph.hh index 5f9915bd9..7c3b04819 100644 --- a/src/graph/pairpos-graph.hh +++ b/src/graph/pairpos-graph.hh @@ -37,7 +37,7 @@ namespace graph { struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat1_3::min_size; @@ -193,7 +193,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.table_size (); unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat2_4::min_size; @@ -621,7 +621,7 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos } } - bool sanitize (const graph_t::vertex_t& vertex) const + bool sanitize (graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/serialize.hh b/src/graph/serialize.hh index 4ad4b0b06..4f89f1011 100644 --- a/src/graph/serialize.hh +++ b/src/graph/serialize.hh @@ -176,12 +176,7 @@ serialize_link_of_type (const hb_serialize_context_t::object_t::link_t& link, const hb_vector_t& id_map, hb_serialize_context_t* c) { - // A link must never write outside the bounds of its parent object. - if (unlikely (link.position + link.width > size)) - { - c->err (HB_SERIALIZE_ERROR_OTHER); - return; - } + assert(link.position + link.width <= size); OT::Offset* offset = reinterpret_cast*> (head + link.position); *offset = 0; diff --git a/src/test-repacker.cc b/src/test-repacker.cc index 50cbcd642..fa8721016 100644 --- a/src/test-repacker.cc +++ b/src/test-repacker.cc @@ -1939,7 +1939,7 @@ static void test_duplicate_leaf () populate_serializer_complex_2 (&a); graph_t graph (a.object_graph ()); - graph.duplicate (4, 1, false); + graph.duplicate (4, 1); graph.normalize(); e.start_serialize(); @@ -1979,7 +1979,7 @@ static void test_duplicate_interior () populate_serializer_complex_3 (&c); graph_t graph (c.object_graph ()); - graph.duplicate (3, 2, false); + graph.duplicate (3, 2); hb_always_assert(strncmp (graph.object (6).head, "jkl", 3) == 0); hb_always_assert(graph.object (6).real_links.length == 1); diff --git a/test/subset/data/fonts/bad-gsub.otf b/test/subset/data/fonts/bad-gsub.otf deleted file mode 100644 index 27ed30b54bfa0aedd7b8ead8796ae9e55b56194c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126580 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 diff --git a/test/subset/data/repack_tests/duplicate_before_mutation.tests b/test/subset/data/repack_tests/duplicate_before_mutation.tests deleted file mode 100644 index 79e019c86..000000000 --- a/test/subset/data/repack_tests/duplicate_before_mutation.tests +++ /dev/null @@ -1,31 +0,0 @@ -bad-gsub.otf -U+0061 -U+0062 -U+0063 -U+0064 -U+0065 -U+0066 -U+0067 -U+0068 -U+0069 -U+006A -U+006B -U+006C -U+006D -U+006E -U+006F -U+0070 -U+0071 -U+0072 -U+0073 -U+0074 -U+0075 -U+0076 -U+0077 -U+0078 -U+0079 -U+007A -U+007B -U+007C -U+007D - diff --git a/test/subset/meson.build b/test/subset/meson.build index e174de892..82fc425a8 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -104,7 +104,6 @@ repack_tests = [ 'isolation', 'advanced_prioritization', 'space_splitting', - 'duplicate_before_mutation', ] run_test = find_program('run-tests.py') From 8207419e0a8f1f6681132086184f97f681ff801b Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Mon, 20 Jul 2026 13:58:18 -0700 Subject: [PATCH 089/112] [subset-repack] increase REPACKER_MAX_VERTICES limit to 800000 --- src/graph/graph.hh | 12 ++++++++++++ src/hb-limits.hh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/graph/graph.hh b/src/graph/graph.hh index 7dc633afc..6ed0f6c86 100644 --- a/src/graph/graph.hh +++ b/src/graph/graph.hh @@ -816,6 +816,9 @@ struct graph_t unsigned next_space = this->next_space (); if (next_space >= HB_REPACKER_MAX_SPACES) { + DEBUG_MSG (SUBSET_REPACK, nullptr, + "num of spaces %u exceeds HB_REPACKER_MAX_SPACES.", + next_space); check_success (false); break; } @@ -1069,6 +1072,9 @@ struct graph_t { if (vertices_.length >= HB_REPACKER_MAX_VERTICES) { + DEBUG_MSG (SUBSET_REPACK, nullptr, + "duplicating node: num of vertices %u exceeds HB_REPACKER_MAX_VERTICES.", + vertices_.length); check_success (false); return -1; } @@ -1234,6 +1240,9 @@ struct graph_t { if (vertices_.length >= HB_REPACKER_MAX_VERTICES) { + DEBUG_MSG (SUBSET_REPACK, nullptr, + "creating new node: num of vertices %u exceeds HB_REPACKER_MAX_VERTICES.", + vertices_.length); check_success (false); return -1; } @@ -1428,6 +1437,9 @@ struct graph_t { if (num_roots_for_space_.length >= HB_REPACKER_MAX_SPACES) { + DEBUG_MSG (SUBSET_REPACK, nullptr, + "move_to_new_space: num of spaces %u exceeds HB_REPACKER_MAX_SPACES.", + num_roots_for_space_.length); check_success (false); return; } diff --git a/src/hb-limits.hh b/src/hb-limits.hh index 097024744..460d4c8a4 100644 --- a/src/hb-limits.hh +++ b/src/hb-limits.hh @@ -130,7 +130,7 @@ #endif #ifndef HB_REPACKER_MAX_VERTICES -#define HB_REPACKER_MAX_VERTICES 100000 +#define HB_REPACKER_MAX_VERTICES 800000 #endif #ifndef HB_REPACKER_MAX_SPACES From 2c875edbb65a8f8b9b4b610bb77ae23f1c61b688 Mon Sep 17 00:00:00 2001 From: Qunxin Liu <48925186+qxliu76@users.noreply.github.com> Date: Tue, 21 Jul 2026 10:49:06 -0700 Subject: [PATCH 090/112] [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. --- src/graph/classdef-graph.hh | 6 +- src/graph/coverage-graph.hh | 6 +- src/graph/graph.hh | 150 +++++++++--------- src/graph/gsubgpos-graph.hh | 4 +- src/graph/ligature-graph.hh | 40 ++--- src/graph/markbasepos-graph.hh | 12 +- src/graph/pairpos-graph.hh | 6 +- src/graph/serialize.hh | 7 +- src/test-repacker.cc | 4 +- test/subset/data/fonts/bad-gsub.otf | Bin 0 -> 126580 bytes .../duplicate_before_mutation.tests | 31 ++++ test/subset/meson.build | 1 + 12 files changed, 141 insertions(+), 126 deletions(-) create mode 100644 test/subset/data/fonts/bad-gsub.otf create mode 100644 test/subset/data/repack_tests/duplicate_before_mutation.tests diff --git a/src/graph/classdef-graph.hh b/src/graph/classdef-graph.hh index df06e00e7..fa604c90e 100644 --- a/src/graph/classdef-graph.hh +++ b/src/graph/classdef-graph.hh @@ -34,7 +34,7 @@ namespace graph { struct ClassDefFormat1 : public OT::ClassDefFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::ClassDefFormat1_3::min_size; @@ -46,7 +46,7 @@ struct ClassDefFormat1 : public OT::ClassDefFormat1_3 struct ClassDefFormat2 : public OT::ClassDefFormat2_4 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::ClassDefFormat2_4::min_size; @@ -112,7 +112,7 @@ struct ClassDef : public OT::ClassDef return true; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::ClassDef::min_size) return false; diff --git a/src/graph/coverage-graph.hh b/src/graph/coverage-graph.hh index 5778ee9e1..457aab771 100644 --- a/src/graph/coverage-graph.hh +++ b/src/graph/coverage-graph.hh @@ -34,7 +34,7 @@ namespace graph { static bool sanitize ( const OT::Layout::Common::CoverageFormat1_3* thiz, - graph_t::vertex_t& vertex + const graph_t::vertex_t& vertex ) { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3::min_size; @@ -45,7 +45,7 @@ static bool sanitize ( static bool sanitize ( const OT::Layout::Common::CoverageFormat2_4* thiz, - graph_t::vertex_t& vertex + const graph_t::vertex_t& vertex ) { size_t vertex_len = vertex.obj.tail - vertex.obj.head; constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4::min_size; @@ -156,7 +156,7 @@ struct Coverage : public OT::Layout::Common::Coverage return true; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Layout::Common::Coverage::min_size) return false; diff --git a/src/graph/graph.hh b/src/graph/graph.hh index 6ed0f6c86..94e0e4ba1 100644 --- a/src/graph/graph.hh +++ b/src/graph/graph.hh @@ -52,6 +52,7 @@ struct graph_t unsigned single_parent = (unsigned) -1; bool has_incoming_virtual_edges_ = false; hb_hashmap_t parents; + hb_set_t virtual_parents; public: auto parents_iter () const HB_AUTO_RETURN @@ -64,7 +65,7 @@ struct graph_t bool in_error () const { - return parents.in_error (); + return parents.in_error () || virtual_parents.in_error (); } bool has_incoming_virtual_edges () const @@ -171,6 +172,7 @@ struct graph_t hb_swap (a.space, b.space); hb_swap (a.single_parent, b.single_parent); hb_swap (a.parents, b.parents); + hb_swap (a.virtual_parents, b.virtual_parents); hb_swap (a.incoming_edges_, b.incoming_edges_); hb_swap (a.has_incoming_virtual_edges_, b.has_incoming_virtual_edges_); hb_swap (a.start, b.start); @@ -193,7 +195,7 @@ struct graph_t bool is_shared () const { - return parents.get_population () > 1; + return parents.get_population () > virtual_parents.get_population () + 1; } unsigned incoming_edges () const @@ -221,12 +223,15 @@ struct graph_t has_incoming_virtual_edges_ = false; single_parent = (unsigned) -1; parents.reset (); + virtual_parents.reset (); } void add_parent (unsigned parent_index, bool is_virtual) { assert (parent_index != (unsigned) -1); has_incoming_virtual_edges_ |= is_virtual; + if (is_virtual) + virtual_parents.add (parent_index); if (incoming_edges_ == 0) { @@ -258,6 +263,7 @@ struct graph_t { single_parent = (unsigned) -1; incoming_edges_--; + virtual_parents.reset (); return; } @@ -268,7 +274,10 @@ struct graph_t if (*v > 1) (*v)--; else + { parents.del (parent_index); + virtual_parents.del (parent_index); + } if (incoming_edges_ == 1) { @@ -295,37 +304,19 @@ struct graph_t } } - bool remap_parents (const hb_vector_t& id_map) - { - if (single_parent != (unsigned) -1) - { - assert (single_parent < id_map.length); - single_parent = id_map[single_parent]; - return true; - } - - hb_hashmap_t new_parents; - new_parents.alloc (parents.get_population ()); - for (auto _ : parents) - { - assert (_.first < id_map.length); - assert (!new_parents.has (id_map[_.first])); - new_parents.set (id_map[_.first], _.second); - } - - if (parents.in_error() || new_parents.in_error ()) - return false; - - parents = std::move (new_parents); - return true; - } - void remap_parent (unsigned old_index, unsigned new_index) { if (single_parent != (unsigned) -1) { if (single_parent == old_index) + { single_parent = new_index; + if (virtual_parents.has (old_index)) + { + virtual_parents.del (old_index); + virtual_parents.add (new_index); + } + } return; } @@ -343,6 +334,12 @@ struct graph_t parents.reset (); } } + + if (virtual_parents.has (old_index)) + { + virtual_parents.del (old_index); + virtual_parents.add (new_index); + } } bool is_leaf () const @@ -437,19 +434,29 @@ struct graph_t } }; - template + enum vertex_mutability_t + { + Immutable, + Mutable + }; + + template struct vertex_and_table_t { vertex_and_table_t () : index (0), vertex (nullptr), table (nullptr) {} - unsigned index; - vertex_t* vertex; - T* table; + template + vertex_and_table_t (const vertex_and_table_t& o) + : index (o.index), vertex (o.vertex), table (o.table) + {} - operator bool () { - return table && vertex; - } + unsigned index; + typename std::conditional::type vertex; + typename std::conditional::type table; + + operator bool () const + { return table && vertex; } }; /* @@ -712,32 +719,32 @@ struct graph_t } template - vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) + const vertex_and_table_t as_table (unsigned parent, const void* offset, Ts... ds) { return as_table_from_index (index_for_offset (parent, offset), std::forward(ds)...); } template - vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) + vertex_and_table_t as_mutable_table (unsigned parent, const void* offset, Ts... ds) { - return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); + return as_table_from_index (mutable_index_for_offset (parent, offset), std::forward(ds)...); } - template - vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) + template + vertex_and_table_t as_table_from_index (unsigned index, Ts... ds) { if (index >= vertices_.length) - return vertex_and_table_t (); + return vertex_and_table_t (); - vertex_and_table_t r; - r.vertex = &vertices_[index]; - r.table = (T*) r.vertex->obj.head; + vertex_and_table_t r; + r.vertex = (typename std::conditional::type) &vertices_[index]; + r.table = (typename std::conditional::type) r.vertex->obj.head; r.index = index; if (!r.table) - return vertex_and_table_t (); + return vertex_and_table_t (); if (!r.table->sanitize (*(r.vertex), std::forward(ds)...)) - return vertex_and_table_t (); + return vertex_and_table_t (); return r; } @@ -773,7 +780,7 @@ struct graph_t for (unsigned p : child.parents_iter ()) { if (p != node_idx) { - return duplicate (node_idx, child_idx); + return duplicate (node_idx, child_idx, true); } } @@ -1068,7 +1075,7 @@ struct graph_t /* * Creates a copy of node_idx and returns it's new index. */ - unsigned duplicate (unsigned node_idx) + unsigned duplicate (unsigned node_idx, bool copy_table = false) { if (vertices_.length >= HB_REPACKER_MAX_VERTICES) { @@ -1091,8 +1098,24 @@ struct graph_t return -1; } - clone->obj.head = child.obj.head; - clone->obj.tail = child.obj.tail; + unsigned table_size = child.obj.tail - child.obj.head; + if (copy_table && table_size) + { + char* buffer = (char*) hb_malloc (table_size); + if (!check_success (buffer && add_buffer (buffer))) + { + hb_free (buffer); + return -1; + } + hb_memcpy (buffer, child.obj.head, table_size); + clone->obj.head = buffer; + clone->obj.tail = buffer + table_size; + } + else + { + clone->obj.head = child.obj.head; + clone->obj.tail = child.obj.tail; + } clone->distance = child.distance; clone->space = child.space; clone->reset_parents (); @@ -1124,7 +1147,7 @@ struct graph_t * If the child_idx only has incoming edges from parent_idx, * duplication isn't possible and this will return -1. */ - unsigned duplicate (unsigned parent_idx, unsigned child_idx) + unsigned duplicate (unsigned parent_idx, unsigned child_idx, bool copy_table = false) { update_parents (); @@ -1148,7 +1171,7 @@ struct graph_t DEBUG_MSG (SUBSET_REPACK, nullptr, " Duplicating %u => %u", parent_idx, child_idx); - unsigned clone_idx = duplicate (child_idx); + unsigned clone_idx = duplicate (child_idx, copy_table); if (clone_idx == (unsigned) -1) return -1; // duplicate shifts the root node idx, so if parent_idx was root update it. if (parent_idx == clone_idx) parent_idx++; @@ -1294,31 +1317,6 @@ struct graph_t return new_child_idx; } - /* - * Creates a new child node and remap the old child at specified position to it. - * - * Returns the index of the newly created child. - * - */ - unsigned remap_child_at_position (unsigned parent_idx, unsigned old_child_idx, const void* offset) - { - const auto& parent = object (parent_idx); - if (!offset || offset < parent.head || offset >= parent.tail) return -1; - - for (auto& l : parent.real_links) - { - if (l.objidx != old_child_idx || offset != parent.head + l.position) - continue; - - unsigned new_child_idx = duplicate (old_child_idx); - if (new_child_idx == (unsigned) -1) return -1; - reassign_link (l, parent_idx, new_child_idx, false); - return new_child_idx; - } - - return -1; - } - /* * Raises the sorting priority of all children. */ diff --git a/src/graph/gsubgpos-graph.hh b/src/graph/gsubgpos-graph.hh index 73f4b1566..6cbea4703 100644 --- a/src/graph/gsubgpos-graph.hh +++ b/src/graph/gsubgpos-graph.hh @@ -50,7 +50,7 @@ struct ExtensionFormat1 : public OT::ExtensionFormat1 this->extensionOffset = 0; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; return vertex_len >= OT::ExtensionFormat1::static_size; @@ -74,7 +74,7 @@ struct Lookup : public OT::Lookup return subTable.len; } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Lookup::min_size) return false; diff --git a/src/graph/ligature-graph.hh b/src/graph/ligature-graph.hh index cfcd11f27..2a0f485ff 100644 --- a/src/graph/ligature-graph.hh +++ b/src/graph/ligature-graph.hh @@ -1,3 +1,4 @@ + /* * Copyright © 2025 Google, Inc. * @@ -39,7 +40,7 @@ namespace graph { struct LigatureSet : public OT::Layout::GSUB_impl::LigatureSet { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < OT::Layout::GSUB_impl::LigatureSet::min_size) return false; @@ -55,7 +56,7 @@ struct LigatureSet : public OT::Layout::GSUB_impl::LigatureSet struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1_2 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = OT::Layout::GSUB_impl::LigatureSubstFormat1_2::min_size; @@ -70,7 +71,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 unsigned this_index) { auto split_points = compute_split_points(c, this_index); - if (!split_points || !duplicate_shared_liga_sets(c, this_index)) + if (!split_points) return hb_vector_t (); split_context_t split_context { @@ -107,7 +108,8 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 return result; } - hb_vector_t ligature_index_to_object_id(const graph_t::vertex_and_table_t& liga_set) const { + template + hb_vector_t ligature_index_to_object_id(const graph_t::vertex_and_table_t& liga_set) const { hb_vector_t map; map.resize_exact(liga_set.table->ligature.len); if (map.in_error()) return map; @@ -124,28 +126,6 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 return map; } - bool duplicate_shared_liga_sets(gsubgpos_graph_context_t& c, unsigned this_index) const - { - hb_set_t visited; - for (unsigned i = 0; i < ligatureSet.len; i++) - { - auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); - if (!liga_set.table) return false; - - unsigned liga_set_index = liga_set.index; - if (visited.has (liga_set_index)) - { - unsigned new_index = c.graph.remap_child_at_position (this_index, liga_set_index, &ligatureSet[i]); - if (new_index == (unsigned) -1) return false; - } - else - { - visited.add (liga_set_index); - } - } - return true; - } - hb_vector_t compute_split_points(gsubgpos_graph_context_t& c, unsigned this_index) const { @@ -342,12 +322,12 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 continue; } - auto liga_set_index = c.graph.index_for_offset(this_index, &ligatureSet[i]); - auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); + auto liga_set = c.graph.as_mutable_table(this_index, &ligatureSet[i]); if (!liga_set.table) { return -1; } + unsigned liga_set_index = liga_set.index; // Bounds may need to be adjusted if some ligas have been previously removed. hb_pair_t liga_bounds = current_liga_set_bounds(c, liga_set_index, liga_set.vertex->obj); current_start = hb_max(count + liga_bounds.first, current_start); @@ -428,7 +408,7 @@ struct LigatureSubstFormat1 : public OT::Layout::GSUB_impl::LigatureSubstFormat1 unsigned new_liga_set_count = 0; for (unsigned i = 0; i < liga_counts.length; i++) { - auto liga_set = c.graph.as_table(this_index, &ligatureSet[i]); + auto liga_set = c.graph.as_mutable_table(this_index, &ligatureSet[i]); if (!liga_set.table) { return false; } @@ -515,7 +495,7 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst } } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/markbasepos-graph.hh b/src/graph/markbasepos-graph.hh index a653f402a..a06ad277c 100644 --- a/src/graph/markbasepos-graph.hh +++ b/src/graph/markbasepos-graph.hh @@ -36,7 +36,7 @@ namespace graph { struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix { - bool sanitize (graph_t::vertex_t& vertex, unsigned class_count) const + bool sanitize (const graph_t::vertex_t& vertex, unsigned class_count) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < AnchorMatrix::min_size) return false; @@ -124,7 +124,7 @@ struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix struct MarkArray : public OT::Layout::GPOS_impl::MarkArray { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = MarkArray::min_size; @@ -205,7 +205,7 @@ struct MarkArray : public OT::Layout::GPOS_impl::MarkArray struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; return vertex_len >= MarkBasePosFormat1::static_size; @@ -448,7 +448,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (sc.this_index, &markArray); + graph.as_mutable_table (sc.this_index, &markArray); if (!mark_array) return -1; unsigned new_mark_array = mark_array.table->clone (sc.c, @@ -460,7 +460,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2 (sc.this_index, &baseArray, class_count); + graph.as_mutable_table (sc.this_index, &baseArray, class_count); if (!base_array) return -1; unsigned new_base_array = base_array.table->clone (sc.c, @@ -490,7 +490,7 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos } } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/pairpos-graph.hh b/src/graph/pairpos-graph.hh index 7c3b04819..5f9915bd9 100644 --- a/src/graph/pairpos-graph.hh +++ b/src/graph/pairpos-graph.hh @@ -37,7 +37,7 @@ namespace graph { struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat1_3::min_size; @@ -193,7 +193,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3 { - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.table_size (); unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat2_4::min_size; @@ -621,7 +621,7 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos } } - bool sanitize (graph_t::vertex_t& vertex) const + bool sanitize (const graph_t::vertex_t& vertex) const { size_t vertex_len = vertex.obj.tail - vertex.obj.head; if (vertex_len < u.format.v.get_size ()) return false; diff --git a/src/graph/serialize.hh b/src/graph/serialize.hh index 4f89f1011..4ad4b0b06 100644 --- a/src/graph/serialize.hh +++ b/src/graph/serialize.hh @@ -176,7 +176,12 @@ serialize_link_of_type (const hb_serialize_context_t::object_t::link_t& link, const hb_vector_t& id_map, hb_serialize_context_t* c) { - assert(link.position + link.width <= size); + // A link must never write outside the bounds of its parent object. + if (unlikely (link.position + link.width > size)) + { + c->err (HB_SERIALIZE_ERROR_OTHER); + return; + } OT::Offset* offset = reinterpret_cast*> (head + link.position); *offset = 0; diff --git a/src/test-repacker.cc b/src/test-repacker.cc index fa8721016..50cbcd642 100644 --- a/src/test-repacker.cc +++ b/src/test-repacker.cc @@ -1939,7 +1939,7 @@ static void test_duplicate_leaf () populate_serializer_complex_2 (&a); graph_t graph (a.object_graph ()); - graph.duplicate (4, 1); + graph.duplicate (4, 1, false); graph.normalize(); e.start_serialize(); @@ -1979,7 +1979,7 @@ static void test_duplicate_interior () populate_serializer_complex_3 (&c); graph_t graph (c.object_graph ()); - graph.duplicate (3, 2); + graph.duplicate (3, 2, false); hb_always_assert(strncmp (graph.object (6).head, "jkl", 3) == 0); hb_always_assert(graph.object (6).real_links.length == 1); diff --git a/test/subset/data/fonts/bad-gsub.otf b/test/subset/data/fonts/bad-gsub.otf new file mode 100644 index 0000000000000000000000000000000000000000..27ed30b54bfa0aedd7b8ead8796ae9e55b56194c GIT binary patch literal 126580 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/repack_tests/duplicate_before_mutation.tests b/test/subset/data/repack_tests/duplicate_before_mutation.tests new file mode 100644 index 000000000..79e019c86 --- /dev/null +++ b/test/subset/data/repack_tests/duplicate_before_mutation.tests @@ -0,0 +1,31 @@ +bad-gsub.otf +U+0061 +U+0062 +U+0063 +U+0064 +U+0065 +U+0066 +U+0067 +U+0068 +U+0069 +U+006A +U+006B +U+006C +U+006D +U+006E +U+006F +U+0070 +U+0071 +U+0072 +U+0073 +U+0074 +U+0075 +U+0076 +U+0077 +U+0078 +U+0079 +U+007A +U+007B +U+007C +U+007D + diff --git a/test/subset/meson.build b/test/subset/meson.build index 82fc425a8..e174de892 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -104,6 +104,7 @@ repack_tests = [ 'isolation', 'advanced_prioritization', 'space_splitting', + 'duplicate_before_mutation', ] run_test = find_program('run-tests.py') From 38976fba5c8a28304699ea8ebaed69f2440284fa Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 21 Jul 2026 14:53:15 -0600 Subject: [PATCH 091/112] [config] Never set HB_NO_CFF here It was affecting subsetting library unintentionally. https://github.com/harfbuzz/harfbuzz/pull/6009#issuecomment-4988163042 --- src/hb-config.hh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hb-config.hh b/src/hb-config.hh index 677360bee..28e70839e 100644 --- a/src/hb-config.hh +++ b/src/hb-config.hh @@ -141,10 +141,6 @@ #define HB_NO_PAINT #endif -#if defined(HB_TINY) && defined(HB_NO_DRAW) -#define HB_NO_CFF -#endif - #ifdef HB_NO_CFF #define HB_NO_OT_FONT_CFF #define HB_NO_SUBSET_CFF From 8b14f7b217f0c5a732bca7c777ca0a55c9a2d53e Mon Sep 17 00:00:00 2001 From: nussaibah shaikh Date: Wed, 22 Jul 2026 06:08:27 +0530 Subject: [PATCH 092/112] [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. --- src/OT/Color/COLR/COLR.hh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index e409cb388..3d2e2fc9e 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -122,7 +122,9 @@ public: static unsigned color_alpha (hb_color_t color, float alpha) { - return roundf (hb_color_get_alpha (color) * alpha); + /* Font-supplied alpha is F2DOT14 plus variation deltas, so it can be + * negative or greater than one; converting that to unsigned is UB. */ + return roundf (hb_color_get_alpha (color) * hb_clamp (alpha, 0.f, 1.f)); } hb_color_t get_color (unsigned int color_index, float alpha, hb_bool_t *is_foreground) @@ -808,10 +810,10 @@ struct PaintRadialGradient { out->x0 = x0 + (int) roundf (instancer (varIdxBase, 0)); out->y0 = y0 + (int) roundf (instancer (varIdxBase, 1)); - out->radius0 = radius0 + (unsigned) roundf (instancer (varIdxBase, 2)); + out->radius0 = hb_clamp ((int) radius0 + (int) roundf (instancer (varIdxBase, 2)), 0, 0xFFFF); out->x1 = x1 + (int) roundf (instancer (varIdxBase, 3)); out->y1 = y1 + (int) roundf (instancer (varIdxBase, 4)); - out->radius1 = radius1 + (unsigned) roundf (instancer (varIdxBase, 5)); + out->radius1 = hb_clamp ((int) radius1 + (int) roundf (instancer (varIdxBase, 5)), 0, 0xFFFF); } if (format == 7 && c->plan->all_axes_pinned) From 387ab23f7f8abf90c1c046fb94af82667116782e Mon Sep 17 00:00:00 2001 From: nussaibah shaikh Date: Wed, 22 Jul 2026 06:10:41 +0530 Subject: [PATCH 093/112] [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. --- src/hb-raster-paint.cc | 6 ++++-- test/api/test-raster.cc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/hb-raster-paint.cc b/src/hb-raster-paint.cc index 46ea2889a..29fe02add 100644 --- a/src/hb-raster-paint.cc +++ b/src/hb-raster-paint.cc @@ -946,7 +946,8 @@ hb_raster_paint_image (hb_paint_funcs_t *pfuncs HB_UNUSED, float ix = (gx - img_x) / img_sx; float iy = (float) (src_height - 1) - (gy - img_y) / img_sy; - if (ix < 0.f || iy < 0.f || + if (unlikely (!std::isfinite (ix) || !std::isfinite (iy)) || + ix < 0.f || iy < 0.f || ix > (float) (src_width - 1) || iy > (float) (src_height - 1)) { gx += inv_xx; @@ -984,7 +985,8 @@ hb_raster_paint_image (hb_paint_funcs_t *pfuncs HB_UNUSED, float ix = (gx - img_x) / img_sx; float iy = (float) (src_height - 1) - (gy - img_y) / img_sy; - if (ix < 0.f || iy < 0.f || + if (unlikely (!std::isfinite (ix) || !std::isfinite (iy)) || + ix < 0.f || iy < 0.f || ix > (float) (src_width - 1) || iy > (float) (src_height - 1)) { gx += inv_xx; diff --git a/test/api/test-raster.cc b/test/api/test-raster.cc index 144e84f05..a07baee8d 100644 --- a/test/api/test-raster.cc +++ b/test/api/test-raster.cc @@ -225,6 +225,43 @@ test_set_glyph_extents_with_transform (void) hb_raster_draw_destroy (rdr); } +/* ── Test 6: image paint under an overflowing transform ──────────── */ + +/* Nested scales, each representable, whose product overflows to infinity. + * The inverse transform then carries NaN into the image sampler's texel + * coordinates. Exercised for the float-to-int conversion, so this needs a + * sanitizer build to catch a regression. */ +static void +test_image_nonfinite_transform (void) +{ + hb_raster_paint_t *paint = hb_raster_paint_create_or_fail (); + g_assert_nonnull (paint); + + hb_raster_extents_t ext = {0, 0, 32, 32, 0}; + hb_raster_paint_set_extents (paint, &ext); + + hb_paint_funcs_t *funcs = hb_raster_paint_get_funcs (paint); + + hb_paint_push_transform (funcs, paint, 1e30f, 0.f, 0.f, 1e30f, 0.f, 0.f); + hb_paint_push_transform (funcs, paint, 1e30f, 0.f, 0.f, 1e30f, 0.f, 0.f); + + const unsigned w = 4, h = 4; + char pixels[w * h * 4]; + memset (pixels, 0, sizeof (pixels)); + hb_blob_t *blob = hb_blob_create (pixels, sizeof (pixels), + HB_MEMORY_MODE_READONLY, nullptr, nullptr); + + hb_glyph_extents_t gext = {0, 32, 32, -32}; + hb_paint_image (funcs, paint, blob, w, h, + HB_PAINT_IMAGE_FORMAT_BGRA, 0.f, &gext); + + hb_paint_pop_transform (funcs, paint); + hb_paint_pop_transform (funcs, paint); + + hb_blob_destroy (blob); + hb_raster_paint_destroy (paint); +} + /* ── main ────────────────────────────────────────────────────────── */ int @@ -237,6 +274,7 @@ main (int argc, char **argv) hb_test_add (test_subpixel_edge); hb_test_add (test_transform); hb_test_add (test_set_glyph_extents_with_transform); + hb_test_add (test_image_nonfinite_transform); return hb_test_run (); } From 53900fd388e9553a1938cb253ff187d7cfa8f0d5 Mon Sep 17 00:00:00 2001 From: nussaibah shaikh Date: Wed, 22 Jul 2026 06:15:53 +0530 Subject: [PATCH 094/112] [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. --- src/hb-gpu-paint.cc | 7 +++++++ test/api/test-gpu.cc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/hb-gpu-paint.cc b/src/hb-gpu-paint.cc index ee8d9f6c1..b179ffc44 100644 --- a/src/hb-gpu-paint.cc +++ b/src/hb-gpu-paint.cc @@ -165,6 +165,13 @@ hb_gpu_paint_push_clip_path_end (hb_paint_funcs_t *funcs HB_UNUSED, } int idx = (int) (c->sub_blobs.length - 1); + if (unlikely (c->clip_depth >= HB_GPU_PAINT_MAX_CLIP_DEPTH)) + { + c->unsupported = true; + c->clip_depth++; + return; + } + int x0 = ext.x_bearing; int x1 = (int) ((int64_t) ext.x_bearing + ext.width); int y0 = ext.y_bearing; diff --git a/test/api/test-gpu.cc b/test/api/test-gpu.cc index fd4a47ade..42ec372c2 100644 --- a/test/api/test-gpu.cc +++ b/test/api/test-gpu.cc @@ -519,6 +519,46 @@ test_paint_recycle_blob (void) } +static void +test_paint_clip_path_depth_overflow (void) +{ + /* push_clip_path_end must honor the same clip-depth cap as + * push_clip_glyph and push_clip_path_start. Interleaving clip + * pushes drives clip_depth past HB_GPU_PAINT_MAX_CLIP_DEPTH before + * the path is closed; without a bound check push_clip_path_end + * wrote past the fixed-size clip_stack (heap-buffer-overflow). */ + hb_gpu_paint_t *p = hb_gpu_paint_create_or_fail (); + g_assert_nonnull (p); + hb_gpu_paint_set_scale (p, 1000, 1000); + + hb_paint_funcs_t *pf = hb_gpu_paint_get_funcs (p); + hb_font_t *font = hb_font_get_empty (); + + void *draw_data = nullptr; + hb_draw_funcs_t *df = hb_paint_push_clip_path_start (pf, p, &draw_data); + g_assert_nonnull (df); + + hb_draw_state_t st = HB_DRAW_STATE_DEFAULT; + hb_draw_move_to (df, draw_data, &st, 0.f, 0.f); + hb_draw_line_to (df, draw_data, &st, 100.f, 0.f); + hb_draw_line_to (df, draw_data, &st, 100.f, 100.f); + hb_draw_close_path (df, draw_data, &st); + + /* Push more clips than the stack holds before closing the path. */ + for (unsigned i = 0; i < 4; i++) + hb_paint_push_clip_glyph (pf, p, i, font); + + hb_paint_push_clip_path_end (pf, p); + + /* Overflowing the clip stack marks the paint unsupported rather + * than writing past clip_stack, so encode returns NULL. */ + hb_blob_t *blob = hb_gpu_paint_encode (p, nullptr); + g_assert_null (blob); + + hb_gpu_paint_destroy (p); +} + + static void test_shapes (void) { @@ -633,6 +673,7 @@ main (int argc, char **argv) hb_test_add (test_paint_auto_clear_on_encode); hb_test_add (test_paint_reset); hb_test_add (test_paint_recycle_blob); + hb_test_add (test_paint_clip_path_depth_overflow); return hb_test_run (); } From cce964cb4f3f29a9addbb079b52c7a712fba93b8 Mon Sep 17 00:00:00 2001 From: Sai Asish Y Date: Tue, 21 Jul 2026 17:47:36 -0700 Subject: [PATCH 095/112] [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 --- src/hb-ot-tag.cc | 4 ++-- test/api/test-ot-tag.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/hb-ot-tag.cc b/src/hb-ot-tag.cc index 6ae6c8287..807de522c 100644 --- a/src/hb-ot-tag.cc +++ b/src/hb-ot-tag.cc @@ -668,10 +668,10 @@ hb_ot_tags_to_script_and_language (hb_tag_t script_tag, primary_script_tag, nullptr, nullptr); *language = hb_ot_tag_to_language (language_tag); - if (script_count == 0 || primary_script_tag[0] != script_tag) + const char *lang_str = *language ? hb_language_to_string (*language) : nullptr; + if (lang_str && (script_count == 0 || primary_script_tag[0] != script_tag)) { unsigned char *buf; - const char *lang_str = hb_language_to_string (*language); size_t len = strlen (lang_str); buf = (unsigned char *) hb_malloc (len + 16); if (unlikely (!buf)) diff --git a/test/api/test-ot-tag.c b/test/api/test-ot-tag.c index 60a9c0c0f..e01c169ca 100644 --- a/test/api/test-ot-tag.c +++ b/test/api/test-ot-tag.c @@ -291,6 +291,9 @@ test_ot_tags_to_script_and_language (void) test_tags_to_script_and_language ("dev2", "MAR", "Deva", "mr-x-hbsc-64657632"); test_tags_to_script_and_language ("dev3", "MAR", "Deva", "mr"); test_tags_to_script_and_language ("qaa", "QTZ0", "Qaaa", "x-hbot-51545a30-hbsc-71616120"); + /* Default language tag maps to a NULL language; the script-suffix path + * must not dereference it. */ + test_tags_to_script_and_language ("DFLT", "dflt", "", NULL); } static void From d65aa90ea656aa1e31ff26b7d052ef2eaa1f418a Mon Sep 17 00:00:00 2001 From: Hanyu Wang Date: Fri, 24 Jul 2026 14:35:58 -0700 Subject: [PATCH 096/112] [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 --- src/hb-buffer-serialize.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-buffer-serialize.cc b/src/hb-buffer-serialize.cc index 923524d70..3aa48b69b 100644 --- a/src/hb-buffer-serialize.cc +++ b/src/hb-buffer-serialize.cc @@ -796,19 +796,19 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, return false; } - hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); - if (!font) font = hb_font_get_empty (); switch (format) { case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); return _hb_buffer_deserialize_text_glyphs (buffer, buf, buf_len, end_ptr, font); case HB_BUFFER_SERIALIZE_FORMAT_JSON: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); return _hb_buffer_deserialize_json (buffer, buf, buf_len, end_ptr, font); @@ -867,18 +867,18 @@ hb_buffer_deserialize_unicode (hb_buffer_t *buffer, return false; } - hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE); - hb_font_t* font = hb_font_get_empty (); switch (format) { case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE); return _hb_buffer_deserialize_text_unicode (buffer, buf, buf_len, end_ptr, font); case HB_BUFFER_SERIALIZE_FORMAT_JSON: + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_UNICODE); return _hb_buffer_deserialize_json (buffer, buf, buf_len, end_ptr, font); From 34baf8d4cd0afc333ee0a601ba6fefa859b37248 Mon Sep 17 00:00:00 2001 From: Thalha Ahmed Date: Sun, 26 Jul 2026 22:49:11 +0530 Subject: [PATCH 097/112] 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. --- src/OT/glyf/glyf-helpers.hh | 2 +- src/hb-algs.hh | 13 +++++++++++++ src/hb-cairo-utils.cc | 2 +- src/hb-gpu-paint.cc | 2 +- src/hb-map.hh | 2 +- src/hb-ot-post-table.hh | 2 +- src/hb-shape.cc | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/OT/glyf/glyf-helpers.hh b/src/OT/glyf/glyf-helpers.hh index f157bf002..5dca10cbb 100644 --- a/src/OT/glyf/glyf-helpers.hh +++ b/src/OT/glyf/glyf-helpers.hh @@ -94,7 +94,7 @@ _add_loca_and_head (hb_subset_context_t *c, unsigned num_offsets = c->plan->num_output_glyphs () + 1; unsigned entry_size = use_short_loca ? 2 : 4; - char *loca_prime_data = (char *) hb_malloc (entry_size * num_offsets); + char *loca_prime_data = (char *) hb_malloc2 (num_offsets, entry_size); if (unlikely (!loca_prime_data)) return false; diff --git a/src/hb-algs.hh b/src/hb-algs.hh index ebd7e9e6c..f61ac439f 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -39,6 +39,19 @@ #include #include +static HB_ALWAYS_INLINE void * +hb_malloc2 (size_t nmemb, size_t size) +{ + if (size && nmemb > SIZE_MAX / size) return nullptr; + return hb_malloc (nmemb * size); +} +static HB_ALWAYS_INLINE void * +hb_realloc2 (void *ptr, size_t nmemb, size_t size) +{ + if (size && nmemb > SIZE_MAX / size) return nullptr; + return hb_realloc (ptr, nmemb * size); +} + /* * Flags */ diff --git a/src/hb-cairo-utils.cc b/src/hb-cairo-utils.cc index 0912cd082..9e45f41d0 100644 --- a/src/hb-cairo-utils.cc +++ b/src/hb-cairo-utils.cc @@ -237,7 +237,7 @@ _hb_cairo_get_color_stops (hb_cairo_context_t *c, return false; if (len > *count) { - *stops = (hb_color_stop_t *) hb_malloc (len * sizeof (hb_color_stop_t)); + *stops = (hb_color_stop_t *) hb_malloc2 (len, sizeof (hb_color_stop_t)); if (unlikely (!*stops)) return false; allocated = true; diff --git a/src/hb-gpu-paint.cc b/src/hb-gpu-paint.cc index b179ffc44..0936475da 100644 --- a/src/hb-gpu-paint.cc +++ b/src/hb-gpu-paint.cc @@ -877,7 +877,7 @@ hb_gpu_paint_emit_sweep (hb_gpu_paint_t *c, hb_color_stop_t *heap_stops = nullptr; if (count > 16) { - heap_stops = (hb_color_stop_t *) hb_malloc (count * sizeof (hb_color_stop_t)); + heap_stops = (hb_color_stop_t *) hb_malloc2 (count, sizeof (hb_color_stop_t)); if (unlikely (!heap_stops)) { c->unsupported = true; return; } stops = heap_stops; } diff --git a/src/hb-map.hh b/src/hb-map.hh index 37cc2460b..56c0e4e44 100644 --- a/src/hb-map.hh +++ b/src/hb-map.hh @@ -204,7 +204,7 @@ struct hb_hashmap_t unsigned int power = hb_bit_storage (hb_max (hb_max ((unsigned) population, new_population) * 2, 4u)); unsigned int new_size = 1u << power; - item_t *new_items = (item_t *) hb_malloc ((size_t) new_size * sizeof (item_t)); + item_t *new_items = (item_t *) hb_malloc2 ((size_t) new_size, sizeof (item_t)); if (unlikely (!new_items)) { successful = false; diff --git a/src/hb-ot-post-table.hh b/src/hb-ot-post-table.hh index 4536c7738..d89a45475 100644 --- a/src/hb-ot-post-table.hh +++ b/src/hb-ot-post-table.hh @@ -188,7 +188,7 @@ struct post if (unlikely (!gids)) { - gids = (uint16_t *) hb_malloc (count * sizeof (gids[0])); + gids = (uint16_t *) hb_malloc2 (count, sizeof (gids[0])); if (unlikely (!gids)) return false; /* Anything better?! */ diff --git a/src/hb-shape.cc b/src/hb-shape.cc index 2a8086fde..400404421 100644 --- a/src/hb-shape.cc +++ b/src/hb-shape.cc @@ -316,7 +316,7 @@ hb_shape_justify (hb_font_t *font, /* Copy buffer text as we need it so we can shape multiple times. */ unsigned text_len = buffer->len; - auto *text_info = (hb_glyph_info_t *) hb_malloc (text_len * sizeof (buffer->info[0])); + auto *text_info = (hb_glyph_info_t *) hb_malloc2 (text_len, sizeof (buffer->info[0])); if (unlikely (text_len && !text_info)) return false; hb_memcpy (text_info, buffer->info, text_len * sizeof (buffer->info[0])); From c2b72d76d8fd4a2cdea6d5706170d17b006b9718 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 26 Jul 2026 17:05:29 -0600 Subject: [PATCH 098/112] [buffer-verify] Fix OOM condition typo Fixes https://github.com/harfbuzz/harfbuzz/issues/6097 --- src/hb-buffer-verify.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-buffer-verify.cc b/src/hb-buffer-verify.cc index 4f102f17b..69c85e991 100644 --- a/src/hb-buffer-verify.cc +++ b/src/hb-buffer-verify.cc @@ -167,7 +167,7 @@ buffer_verify_unsafe_to_break (hb_buffer_t *buffer, hb_buffer_append (fragment, text_buffer, text_start, text_end); if (!hb_shape_full (font, fragment, features, num_features, shapers) || - fragment->successful) + !fragment->successful) return true; hb_buffer_append (reconstruction, fragment, 0, -1); From 04b410b15702a85a03e2232fab92449453767430 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:12:03 +0000 Subject: [PATCH 099/112] Bump github/codeql-action/upload-sarif from 4.37.1 to 4.37.3 Bumps [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) from 4.37.1 to 4.37.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/7188fc363630916deb702c7fdcf4e481b751f97a...e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81) --- updated-dependencies: - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.37.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index ff4ebcfce..d106c7a08 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v3.29.5 + uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v3.29.5 with: sarif_file: results.sarif From 16ecba7c57b83a2c47164aec7355e21dade5e183 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:11:52 +0000 Subject: [PATCH 100/112] Bump actions/checkout from 7.0.0 to 7.0.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0...3d3c42e5aac5ba805825da76410c181273ba90b1) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/arm.yml | 2 +- .github/workflows/c++-versions.yml | 2 +- .github/workflows/configs-build.yml | 2 +- .github/workflows/coverity-scan.yml | 2 +- .github/workflows/crossbuild-mingw.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/linux.yml | 4 ++-- .github/workflows/macos.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/msys2.yml | 2 +- .github/workflows/rust.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- .github/workflows/scorecard.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/arm.yml b/.github/workflows/arm.yml index 37aa885f5..6bb28247e 100644 --- a/.github/workflows/arm.yml +++ b/.github/workflows/arm.yml @@ -15,7 +15,7 @@ jobs: container: image: devkitpro/devkitarm:latest steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Configure CMake run: | cmake -S . -B build \ diff --git a/.github/workflows/c++-versions.yml b/.github/workflows/c++-versions.yml index 9e482b31f..63f9e0233 100644 --- a/.github/workflows/c++-versions.yml +++ b/.github/workflows/c++-versions.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Install Dependencies run: | sudo apt-get update diff --git a/.github/workflows/configs-build.yml b/.github/workflows/configs-build.yml index f2bf2d0d9..c7b059a7a 100644 --- a/.github/workflows/configs-build.yml +++ b/.github/workflows/configs-build.yml @@ -26,7 +26,7 @@ jobs: name: ${{ matrix.config }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Create main.cc run: | cat < main.cc diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index cbcbb3cca..efdcb4fac 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -11,7 +11,7 @@ jobs: latest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - run: sudo apt-get install gcc clang wget git curl pkg-config libfreetype6-dev libglib2.0-dev libicu-dev libgraphite2-dev diff --git a/.github/workflows/crossbuild-mingw.yml b/.github/workflows/crossbuild-mingw.yml index 2090c1c9b..9a027e24f 100644 --- a/.github/workflows/crossbuild-mingw.yml +++ b/.github/workflows/crossbuild-mingw.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies @@ -64,7 +64,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Download artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e6c3e84e0..9f81db62f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b8186348d..365b21861 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: @@ -82,7 +82,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Download artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b2717116c..bcd050373 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 1c0f592cb..b36fadc33 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 7ed6258f6..cb55c993f 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -28,7 +28,7 @@ jobs: shell: msys2 {0} steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup MSYS2 uses: msys2/setup-msys2@cf96e00c0aab3788743aaf63b64146f0d383cee9 # v2 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5fdf4f158..5c4ee3a94 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 with: diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 42d8bd91e..e06da904e 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index d106c7a08..c8dbc05d9 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -29,7 +29,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index ed7efac40..d02f16893 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Ccache uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23 - name: Install Dependencies From 4643e3b4c844603b64e85d35e25197419d095efb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:11:39 +0000 Subject: [PATCH 101/112] Bump ossf/scorecard-action from 2.4.3 to 2.4.4 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/4eaacf0543bb3f2c246792bd56e8cdeffafb205a...2d1146689b8cda280b9bc96326124645441f03bc) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-version: 2.4.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index c8dbc05d9..90d7e3623 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -34,7 +34,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 + uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4 with: results_file: results.sarif results_format: sarif From 59b6e1c147363bd286b3eada4e9144f24667a530 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 27 Jul 2026 14:50:16 +0300 Subject: [PATCH 102/112] Fix upload-sarif version number comment [ci skip] Hopefully the bot will keep it updated next time. --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 90d7e3623..be53b1be7 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v3.29.5 + uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3 with: sarif_file: results.sarif From 72c6c3c757adafef7b247353ebe0cb49b8821499 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 27 Jul 2026 10:55:58 -0600 Subject: [PATCH 103/112] [MSVC] Suppress another unused-var warning Fixes https://github.com/harfbuzz/harfbuzz/issues/6095 --- src/hb.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb.hh b/src/hb.hh index 5d7c45c79..f25845466 100644 --- a/src/hb.hh +++ b/src/hb.hh @@ -280,7 +280,7 @@ #if defined(__GNUC__) && (__GNUC__ >= 4) || (__clang__) #define HB_UNUSED __attribute__((unused)) #elif defined(_MSC_VER) /* https://github.com/harfbuzz/harfbuzz/issues/635 */ -#define HB_UNUSED __pragma(warning(suppress: 4100 4101)) +#define HB_UNUSED __pragma(warning(suppress: 4100 4101 4189)) #else #define HB_UNUSED #endif From 884f5a79913927e0c2baaa62ef54307ecbaa8a14 Mon Sep 17 00:00:00 2001 From: nussaibah shaikh Date: Mon, 27 Jul 2026 22:29:22 +0530 Subject: [PATCH 104/112] [subset] guard scalars resize in cff2-to-cff1 blend encoder (#6093) --- src/hb-subset-cff2.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc index 687b15d9d..9725daf21 100644 --- a/src/hb-subset-cff2.cc +++ b/src/hb-subset-cff2.cc @@ -786,7 +786,12 @@ struct cff2_private_blend_encoder_param_t if (!seen_blend) { region_count = varStore->varStore.get_region_index_count (ivs); - scalars.resize_exact (region_count); + if (unlikely (!scalars.resize_exact (region_count))) + { + if (c) c->err (HB_SERIALIZE_ERROR_OTHER); + seen_blend = true; + return; + } varStore->varStore.get_region_scalars (ivs, normalized_coords.arrayZ, normalized_coords.length, &scalars[0], region_count); seen_blend = true; From f3dea1e60277ca2ebf62af92aa67743841dcb401 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 30 Apr 2026 03:34:49 +0300 Subject: [PATCH 105/112] [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. --- src/hb-subset-cff1.cc | 22 +++++--- src/hb-subset.h | 4 ++ ...SourceHanSans-Regular.41,4C2E.identity.otf | Bin 0 -> 2760 bytes test/api/test-subset-cff1.c | 50 ++++++++++++++++++ util/hb-subset.cc | 1 + 5 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 test/api/fonts/SourceHanSans-Regular.41,4C2E.identity.otf diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc index ba71e4cc8..4c2da6b40 100644 --- a/src/hb-subset-cff1.cc +++ b/src/hb-subset-cff1.cc @@ -529,7 +529,7 @@ struct cff1_subset_plan if (it->first == 0) it++; auto _ = *it; bool not_is_cid = !acc.is_CID (); - bool skip = !not_is_cid && glyph_to_sid_map; + bool skip = !not_is_cid && glyph_to_sid_map && !identity_charset; if (not_is_cid) sidmap.alloc (num_glyphs); for (hb_codepoint_t glyph = 1; glyph < num_glyphs; glyph++) @@ -545,12 +545,18 @@ struct cff1_subset_plan /* Retain the SID for the old missing glyph ID */ old_glyph = glyph; } - unsigned sid = glyph_to_sid_map ? - glyph_to_sid_map->arrayZ[old_glyph].code : - acc.glyph_to_sid (old_glyph, &glyph_to_sid_cache); + unsigned sid; + if (identity_charset) + sid = glyph; + else + { + sid = glyph_to_sid_map ? + glyph_to_sid_map->arrayZ[old_glyph].code : + acc.glyph_to_sid (old_glyph, &glyph_to_sid_cache); - if (not_is_cid) - sid = sidmap.add (sid); + if (not_is_cid) + sid = sidmap.add (sid); + } if (sid != last_sid + 1) subset_charset_ranges.push (code_pair_t {sid, glyph}); @@ -621,6 +627,7 @@ struct cff1_subset_plan orig_fdcount = acc.fdCount; drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING; desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE; + identity_charset = (plan->flags & HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET) && acc.is_CID (); #ifdef HB_EXPERIMENTAL_API min_charstrings_off_size = (plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS) ? 4 : 0; @@ -628,7 +635,7 @@ struct cff1_subset_plan min_charstrings_off_size = 0; #endif - subset_charset = !acc.is_predef_charset (); + subset_charset = !acc.is_predef_charset () || identity_charset; if (!subset_charset) /* check whether the subset renumbers any glyph IDs */ for (const auto &_ : plan->new_to_old_gid_list) @@ -786,6 +793,7 @@ struct cff1_subset_plan unsigned int topDictModSIDs[name_dict_values_t::ValCount]; bool desubroutinize = false; + bool identity_charset = false; unsigned min_charstrings_off_size = 0; }; diff --git a/src/hb-subset.h b/src/hb-subset.h index 6f623273d..705e5524f 100644 --- a/src/hb-subset.h +++ b/src/hb-subset.h @@ -87,6 +87,9 @@ typedef struct hb_subset_plan_t hb_subset_plan_t; * @HB_SUBSET_FLAGS_DOWNGRADE_CFF2: If set and instantiating a variable font * with all axes pinned, convert the output CFF2 table to CFF1. This enables * compatibility with older renderers that don't support CFF2. Since: 13.0.0 + * @HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET: If set and subsetting a CID-keyed CFF + * font, the output CFF charset will use sequential identity CIDs (CID = new + * GID) rather than preserving the original CIDs. XSince: REPLACEME * * List of boolean properties that can be configured on the subset input. * @@ -111,6 +114,7 @@ typedef enum { /*< flags >*/ HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS = 0x00002000u, #endif HB_SUBSET_FLAGS_DOWNGRADE_CFF2 = 0x00004000u, + HB_SUBSET_FLAGS_CFF_IDENTITY_CHARSET = 0x00008000u, } hb_subset_flags_t; /** diff --git a/test/api/fonts/SourceHanSans-Regular.41,4C2E.identity.otf b/test/api/fonts/SourceHanSans-Regular.41,4C2E.identity.otf new file mode 100644 index 0000000000000000000000000000000000000000..ddb4cc6de06525fb4bc4f1d7ac75344fde24c0c6 GIT binary patch literal 2760 zcma)6Yfuzd7Ct>Q^bErU5Eva1p_ejB3=W8o%7V!XDrl`Ggh8UwRhwa$8DJjvG>=gP zYV_-GnP&jcuMEx{Gq0E*Y1Ubq` zDUNP$CE6QY#(BzGv}cwX%|J&87qtY z4+d;{ES-*kKlBGS5*(4!i^Ye2P9>>L4l?4E2GK|rA-IyWLqH+bNTZ|>m$*~!^`c*r z-rK`}p39J+)vy&G<<{h#84zo9bNLW$=1h4IZDH+ZX|+Oh9&2YII-lk35RH4VWU@%C zM3Kw?L^XjA-a)-=58A(;k<f4?`~og>9c3iCdFWVKd20?)27@PEwl>=_w@v z$RcFlpkRQO@>N3;Ue`>X(LXEC7detDsXP;BCpRu}QJ6pJ8igL2)GxrB4n-Ti-X|#M zKLkmJ65b^pR`{a+S8C;~PJte#W_1~UIscs1<**aFXLZFqj1Tazde%>)24DaO6aWWC zFu`_U!HyoXx?l~YqtA@deDrXTi57=`EAFskXVxNbEI#WY0efRu;ISZzM^=I@oQvt< z4SbUmz=n)@$VV_a$diw(Ss2m72AmsV9kRxvoPS0lz9~tNio1V)&Iv$vrQ*JA3#ysV z!OT|9%+<~;KySfJo#4j$t=JI@X3fAwoN<`tTFfSa2dGyCa3_eBDqesLGHodgdhOyVA6N@k#9(T=T>yqxL5Ld#M zjO=zP&t1r1lX6-0lg_OIJ-&+gl~UAVgQI{mnzplc18aA!NjI4b@>z~V_J>jRVbsZ! zn(#2Hh6;YSMw?g*(;hAL_AmoDjB}&_uyOjHwfTG_D$4*Ee@xfvzjeD6BoO7eKc7&Fp1fY zEE8jJyLgk$#q6*f9h}p_vAijpiL&s#Gd?D!sHjNK5}4lTu*JL<%@kRA3zKegnYcoP zB|GdqvkQOO%&M7MSLvA`m~)e+(tZKLHL(1~Lj&IYk95e?5$9(5wuD zaB@d)1%*+bIcq;!jl`0!@ko%^coIQA$tUSy^|0UY-!vMWuQX^DJuM0OkM@7jJL)g} z?zD7kG+(y9_aa`}J~iASZ0(@M#tX^`^?kpI)-xK-eFB*JG2}^r7EcK#8Lf@qtQ`~- z@Bh8;>)wAXJ;f~l;EgMyLibP{)&4+>o+pQWR-kxx*ylU?j{@%_T%i3g6bk%bgz2yR zsK%)u1A-Wb1gbG+_%2gd~8>mkFxVM0{Bn?ok3zz{7!@W{Tjr%6*I+F&Y;5lhB| zw?7x({!GaIB9iXt?!3^^v#U#2Uf|9>!l}dny1btsDCpZ$sOxZd7PJ+r#3k!UE0aW zcv{F`9RFyN7P}N1>Bg%Kg9D+Hw2(EuQd?15Q+_2JI1owkXZj)*AbX>a!=>tIt|XbZvaA zqxJCSa$VQp`CA>gvbuC-24`w@Y30$X;}!KyB`r=*nW|pd*3#AdV^?EE<8e=gr$N_J z(o)!XL^XQ3;dD<#Piss2mC$dM-<+%aG~t-fUBOq`lF|BZyHOQ9@p_=qaezPIK2zSw zHJ1%{kMszRgAEfJQA!b-!k=_NE%+;%-exbd$kofx5P`>1{J>_AGJ zt~#&uP??onN$|K@F|88zD=vLig!YQ=g4SaXzP~B>_6oF0%u%izE*7G~r$T5! z(bxA~Tf}issi&-|, "If set don't renumber glyph ids in the subset.", nullptr}, {"desubroutinize", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &set_flag, "Remove CFF/CFF2 use of subroutines", nullptr}, {"downgrade-cff2", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &set_flag, "Convert instantiated variable fonts from CFF2 to CFF1", nullptr}, + {"cff-identity-charset", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &set_flag, "Emit identity CFF charset (CID = new GID) for CID-keyed CFF", nullptr}, {"name-legacy", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &set_flag, "Keep legacy (non-Unicode) 'name' table entries", nullptr}, {"set-overlaps-flag", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &set_flag, "Set the overlaps flag on each glyph.", nullptr}, {"notdef-outline", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) &set_flag, "Keep the outline of \'.notdef\' glyph", nullptr}, From da7f951ef04f7d68e13b6550162390e6565cb263 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 27 Jul 2026 19:20:18 -0600 Subject: [PATCH 106/112] Add more hb_barrier()s in switches (#6106) Fixes https://github.com/harfbuzz/harfbuzz/security/advisories/GHSA-pmg2-m89x-pc6j --- src/OT/Color/CBDT/CBDT.hh | 17 +-- src/OT/Color/COLR/COLR.hh | 80 +++++++------ src/OT/Layout/Common/Coverage.hh | 112 +++++++++--------- src/OT/Layout/GDEF/GDEF.hh | 81 ++++++------- src/OT/Layout/GPOS/Anchor.hh | 18 +-- src/OT/Layout/GPOS/CursivePos.hh | 2 +- src/OT/Layout/GPOS/MarkBasePos.hh | 4 +- src/OT/Layout/GPOS/MarkLigPos.hh | 4 +- src/OT/Layout/GPOS/MarkMarkPos.hh | 4 +- src/OT/Layout/GPOS/PairPos.hh | 8 +- src/OT/Layout/GPOS/PosLookupSubTable.hh | 18 +-- src/OT/Layout/GPOS/SinglePos.hh | 8 +- src/OT/Layout/GSUB/AlternateSubst.hh | 6 +- src/OT/Layout/GSUB/LigatureSubst.hh | 6 +- src/OT/Layout/GSUB/MultipleSubst.hh | 6 +- src/OT/Layout/GSUB/ReverseChainSingleSubst.hh | 2 +- src/OT/Layout/GSUB/SingleSubst.hh | 16 +-- src/OT/Layout/GSUB/SubstLookup.hh | 2 +- src/OT/Layout/GSUB/SubstLookupSubTable.hh | 16 +-- src/graph/gsubgpos-graph.hh | 4 +- src/graph/ligature-graph.hh | 2 + src/graph/markbasepos-graph.hh | 2 + src/graph/pairpos-graph.hh | 4 + src/hb-aat-layout-bsln-table.hh | 8 +- src/hb-aat-layout-kerx-table.hh | 20 ++-- src/hb-aat-layout-morx-table.hh | 10 +- src/hb-open-file.hh | 16 +-- src/hb-ot-cmap-table.hh | 3 +- src/hb-ot-kern-table.hh | 20 ++-- src/hb-ot-layout-common.hh | 18 ++- test/api/test-ot-layout.c | 44 +++++++ 31 files changed, 316 insertions(+), 245 deletions(-) diff --git a/src/OT/Color/CBDT/CBDT.hh b/src/OT/Color/CBDT/CBDT.hh index 2d8f1da52..0bfaf8c46 100644 --- a/src/OT/Color/CBDT/CBDT.hh +++ b/src/OT/Color/CBDT/CBDT.hh @@ -207,8 +207,8 @@ struct IndexSubtable hb_barrier (); switch (u.header.indexFormat) { - case 1: return_trace (u.format1.sanitize (c, glyph_count)); - case 3: return_trace (u.format3.sanitize (c, glyph_count)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c, glyph_count)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c, glyph_count)); default:return_trace (true); } } @@ -224,8 +224,9 @@ struct IndexSubtable unsigned int local_offset = cbdt_prime_len - u.header.imageDataOffset; switch (u.header.indexFormat) { - case 1: return_trace (u.format1.add_offset (c, local_offset, size)); + case 1: hb_barrier (); return_trace (u.format1.add_offset (c, local_offset, size)); case 3: { + hb_barrier (); if (!u.format3.add_offset (c, local_offset, size)) return_trace (false); if (!(num_glyphs & 0x01)) // Pad to 32-bit alignment if needed. @@ -252,6 +253,7 @@ struct IndexSubtable switch (u.header.indexFormat) { case 1: { + hb_barrier (); for (unsigned int i = 0; i < num_missing; i++) { if (unlikely (!u.format1.add_offset (c, local_offset, size))) @@ -261,6 +263,7 @@ struct IndexSubtable return_trace (true); } case 3: { + hb_barrier (); for (unsigned int i = 0; i < num_missing; i++) { if (unlikely (!u.format3.add_offset (c, local_offset, size))) @@ -303,8 +306,8 @@ struct IndexSubtable TRACE_SERIALIZE (this); switch (u.header.indexFormat) { - case 1: return_trace (u.format1.add_offset (c, local_offset, size)); - case 3: return_trace (u.format3.add_offset (c, local_offset, size)); + case 1: hb_barrier (); return_trace (u.format1.add_offset (c, local_offset, size)); + case 3: hb_barrier (); return_trace (u.format3.add_offset (c, local_offset, size)); // TODO: Implement tables 2, 4, 5 case 2: // Should be a no-op. case 4: case 5: // Handle sparse cases. @@ -329,8 +332,8 @@ struct IndexSubtable *format = u.header.imageFormat; switch (u.header.indexFormat) { - case 1: return u.format1.get_image_data (idx, offset, length); - case 3: return u.format3.get_image_data (idx, offset, length); + case 1: hb_barrier (); return u.format1.get_image_data (idx, offset, length); + case 3: hb_barrier (); return u.format3.get_image_data (idx, offset, length); default: return false; } } diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index 3d2e2fc9e..cdca66874 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -1636,8 +1636,8 @@ struct ClipBox { TRACE_SUBSET (this); switch (u.format.v) { - case 1: return_trace (u.format1.subset (c, instancer, VarIdx::NO_VARIATION)); - case 2: return_trace (u.format2.subset (c, instancer)); + case 1: hb_barrier (); return_trace (u.format1.subset (c, instancer, VarIdx::NO_VARIATION)); + case 2: hb_barrier (); return_trace (u.format2.subset (c, instancer)); default:return_trace (c->default_return_value ()); } } @@ -1645,7 +1645,7 @@ struct ClipBox void closurev1 (hb_colrv1_closure_context_t* c) const { switch (u.format.v) { - case 2: u.format2.closurev1 (c); return; + case 2: hb_barrier (); u.format2.closurev1 (c); return; default:return; } } @@ -1656,8 +1656,8 @@ struct ClipBox if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } @@ -1668,9 +1668,11 @@ struct ClipBox ClipBoxData clip_box; switch (u.format.v) { case 1: + hb_barrier (); u.format1.get_clip_box (clip_box, instancer); break; case 2: + hb_barrier (); u.format2.get_clip_box (clip_box, instancer); break; default: @@ -1866,38 +1868,38 @@ struct Paint if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.paintformat1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.paintformat2, std::forward (ds)...)); - case 3: return_trace (c->dispatch (u.paintformat3, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.paintformat4, std::forward (ds)...)); - case 5: return_trace (c->dispatch (u.paintformat5, std::forward (ds)...)); - case 6: return_trace (c->dispatch (u.paintformat6, std::forward (ds)...)); - case 7: return_trace (c->dispatch (u.paintformat7, std::forward (ds)...)); - case 8: return_trace (c->dispatch (u.paintformat8, std::forward (ds)...)); - case 9: return_trace (c->dispatch (u.paintformat9, std::forward (ds)...)); - case 10: return_trace (c->dispatch (u.paintformat10, std::forward (ds)...)); - case 11: return_trace (c->dispatch (u.paintformat11, std::forward (ds)...)); - case 12: return_trace (c->dispatch (u.paintformat12, std::forward (ds)...)); - case 13: return_trace (c->dispatch (u.paintformat13, std::forward (ds)...)); - case 14: return_trace (c->dispatch (u.paintformat14, std::forward (ds)...)); - case 15: return_trace (c->dispatch (u.paintformat15, std::forward (ds)...)); - case 16: return_trace (c->dispatch (u.paintformat16, std::forward (ds)...)); - case 17: return_trace (c->dispatch (u.paintformat17, std::forward (ds)...)); - case 18: return_trace (c->dispatch (u.paintformat18, std::forward (ds)...)); - case 19: return_trace (c->dispatch (u.paintformat19, std::forward (ds)...)); - case 20: return_trace (c->dispatch (u.paintformat20, std::forward (ds)...)); - case 21: return_trace (c->dispatch (u.paintformat21, std::forward (ds)...)); - case 22: return_trace (c->dispatch (u.paintformat22, std::forward (ds)...)); - case 23: return_trace (c->dispatch (u.paintformat23, std::forward (ds)...)); - case 24: return_trace (c->dispatch (u.paintformat24, std::forward (ds)...)); - case 25: return_trace (c->dispatch (u.paintformat25, std::forward (ds)...)); - case 26: return_trace (c->dispatch (u.paintformat26, std::forward (ds)...)); - case 27: return_trace (c->dispatch (u.paintformat27, std::forward (ds)...)); - case 28: return_trace (c->dispatch (u.paintformat28, std::forward (ds)...)); - case 29: return_trace (c->dispatch (u.paintformat29, std::forward (ds)...)); - case 30: return_trace (c->dispatch (u.paintformat30, std::forward (ds)...)); - case 31: return_trace (c->dispatch (u.paintformat31, std::forward (ds)...)); - case 32: return_trace (c->dispatch (u.paintformat32, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.paintformat1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.paintformat2, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.paintformat3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.paintformat4, std::forward (ds)...)); + case 5: hb_barrier (); return_trace (c->dispatch (u.paintformat5, std::forward (ds)...)); + case 6: hb_barrier (); return_trace (c->dispatch (u.paintformat6, std::forward (ds)...)); + case 7: hb_barrier (); return_trace (c->dispatch (u.paintformat7, std::forward (ds)...)); + case 8: hb_barrier (); return_trace (c->dispatch (u.paintformat8, std::forward (ds)...)); + case 9: hb_barrier (); return_trace (c->dispatch (u.paintformat9, std::forward (ds)...)); + case 10: hb_barrier (); return_trace (c->dispatch (u.paintformat10, std::forward (ds)...)); + case 11: hb_barrier (); return_trace (c->dispatch (u.paintformat11, std::forward (ds)...)); + case 12: hb_barrier (); return_trace (c->dispatch (u.paintformat12, std::forward (ds)...)); + case 13: hb_barrier (); return_trace (c->dispatch (u.paintformat13, std::forward (ds)...)); + case 14: hb_barrier (); return_trace (c->dispatch (u.paintformat14, std::forward (ds)...)); + case 15: hb_barrier (); return_trace (c->dispatch (u.paintformat15, std::forward (ds)...)); + case 16: hb_barrier (); return_trace (c->dispatch (u.paintformat16, std::forward (ds)...)); + case 17: hb_barrier (); return_trace (c->dispatch (u.paintformat17, std::forward (ds)...)); + case 18: hb_barrier (); return_trace (c->dispatch (u.paintformat18, std::forward (ds)...)); + case 19: hb_barrier (); return_trace (c->dispatch (u.paintformat19, std::forward (ds)...)); + case 20: hb_barrier (); return_trace (c->dispatch (u.paintformat20, std::forward (ds)...)); + case 21: hb_barrier (); return_trace (c->dispatch (u.paintformat21, std::forward (ds)...)); + case 22: hb_barrier (); return_trace (c->dispatch (u.paintformat22, std::forward (ds)...)); + case 23: hb_barrier (); return_trace (c->dispatch (u.paintformat23, std::forward (ds)...)); + case 24: hb_barrier (); return_trace (c->dispatch (u.paintformat24, std::forward (ds)...)); + case 25: hb_barrier (); return_trace (c->dispatch (u.paintformat25, std::forward (ds)...)); + case 26: hb_barrier (); return_trace (c->dispatch (u.paintformat26, std::forward (ds)...)); + case 27: hb_barrier (); return_trace (c->dispatch (u.paintformat27, std::forward (ds)...)); + case 28: hb_barrier (); return_trace (c->dispatch (u.paintformat28, std::forward (ds)...)); + case 29: hb_barrier (); return_trace (c->dispatch (u.paintformat29, std::forward (ds)...)); + case 30: hb_barrier (); return_trace (c->dispatch (u.paintformat30, std::forward (ds)...)); + case 31: hb_barrier (); return_trace (c->dispatch (u.paintformat31, std::forward (ds)...)); + case 32: hb_barrier (); return_trace (c->dispatch (u.paintformat32, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } @@ -1906,8 +1908,8 @@ struct Paint hb_bool_t *is_foreground, hb_color_t *color) const { switch (u.format.v) { - case 2: u.paintformat2.get_solid_color (c, is_foreground, color); return true; - case 3: u.paintformat3.get_solid_color (c, is_foreground, color); return true; + case 2: hb_barrier (); u.paintformat2.get_solid_color (c, is_foreground, color); return true; + case 3: hb_barrier (); u.paintformat3.get_solid_color (c, is_foreground, color); return true; default: return false; } } diff --git a/src/OT/Layout/Common/Coverage.hh b/src/OT/Layout/Common/Coverage.hh index 93ca1b2f7..be7444d50 100644 --- a/src/OT/Layout/Common/Coverage.hh +++ b/src/OT/Layout/Common/Coverage.hh @@ -67,11 +67,11 @@ struct Coverage hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (u.format3.sanitize (c)); - case 4: return_trace (u.format4.sanitize (c)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); + case 4: hb_barrier (); return_trace (u.format4.sanitize (c)); #endif default:return_trace (true); } @@ -87,11 +87,11 @@ struct Coverage unsigned int get_coverage (hb_codepoint_t glyph_id) const { switch (u.format.v) { - case 1: return u.format1.get_coverage (glyph_id); - case 2: return u.format2.get_coverage (glyph_id); + case 1: hb_barrier (); return u.format1.get_coverage (glyph_id); + case 2: hb_barrier (); return u.format2.get_coverage (glyph_id); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.get_coverage (glyph_id); - case 4: return u.format4.get_coverage (glyph_id); + case 3: hb_barrier (); return u.format3.get_coverage (glyph_id); + case 4: hb_barrier (); return u.format4.get_coverage (glyph_id); #endif default:return NOT_COVERED; } @@ -129,11 +129,11 @@ struct Coverage unsigned get_population () const { switch (u.format.v) { - case 1: return u.format1.get_population (); - case 2: return u.format2.get_population (); + case 1: hb_barrier (); return u.format1.get_population (); + case 2: hb_barrier (); return u.format2.get_population (); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.get_population (); - case 4: return u.format4.get_population (); + case 3: hb_barrier (); return u.format3.get_population (); + case 4: hb_barrier (); return u.format4.get_population (); #endif default:return NOT_COVERED; } @@ -176,11 +176,11 @@ struct Coverage switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, glyphs)); - case 2: return_trace (u.format2.serialize (c, glyphs)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, glyphs)); + case 2: hb_barrier (); return_trace (u.format2.serialize (c, glyphs)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (u.format3.serialize (c, glyphs)); - case 4: return_trace (u.format4.serialize (c, glyphs)); + case 3: hb_barrier (); return_trace (u.format3.serialize (c, glyphs)); + case 4: hb_barrier (); return_trace (u.format4.serialize (c, glyphs)); #endif default:return_trace (false); } @@ -207,11 +207,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.intersects (glyphs); - case 2: return u.format2.intersects (glyphs); + case 1: hb_barrier (); return u.format1.intersects (glyphs); + case 2: hb_barrier (); return u.format2.intersects (glyphs); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.intersects (glyphs); - case 4: return u.format4.intersects (glyphs); + case 3: hb_barrier (); return u.format3.intersects (glyphs); + case 4: hb_barrier (); return u.format4.intersects (glyphs); #endif default:return false; } @@ -220,11 +220,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.intersects_coverage (glyphs, index); - case 2: return u.format2.intersects_coverage (glyphs, index); + case 1: hb_barrier (); return u.format1.intersects_coverage (glyphs, index); + case 2: hb_barrier (); return u.format2.intersects_coverage (glyphs, index); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.intersects_coverage (glyphs, index); - case 4: return u.format4.intersects_coverage (glyphs, index); + case 3: hb_barrier (); return u.format3.intersects_coverage (glyphs, index); + case 4: hb_barrier (); return u.format4.intersects_coverage (glyphs, index); #endif default:return false; } @@ -250,11 +250,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.collect_coverage (glyphs); - case 2: return u.format2.collect_coverage (glyphs); + case 1: hb_barrier (); return u.format1.collect_coverage (glyphs); + case 2: hb_barrier (); return u.format2.collect_coverage (glyphs); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.collect_coverage (glyphs); - case 4: return u.format4.collect_coverage (glyphs); + case 3: hb_barrier (); return u.format3.collect_coverage (glyphs); + case 4: hb_barrier (); return u.format4.collect_coverage (glyphs); #endif default:return false; } @@ -266,11 +266,11 @@ struct Coverage { switch (u.format.v) { - case 1: return u.format1.intersect_set (glyphs, intersect_glyphs); - case 2: return u.format2.intersect_set (glyphs, intersect_glyphs); + case 1: hb_barrier (); return u.format1.intersect_set (glyphs, intersect_glyphs); + case 2: hb_barrier (); return u.format2.intersect_set (glyphs, intersect_glyphs); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.intersect_set (glyphs, intersect_glyphs); - case 4: return u.format4.intersect_set (glyphs, intersect_glyphs); + case 3: hb_barrier (); return u.format3.intersect_set (glyphs, intersect_glyphs); + case 4: hb_barrier (); return u.format4.intersect_set (glyphs, intersect_glyphs); #endif default:return ; } @@ -285,11 +285,11 @@ struct Coverage format = c_.u.format.v; switch (format) { - case 1: u.format1.init (c_.u.format1); return; - case 2: u.format2.init (c_.u.format2); return; + case 1: hb_barrier (); u.format1.init (c_.u.format1); return; + case 2: hb_barrier (); u.format2.init (c_.u.format2); return; #ifndef HB_NO_BEYOND_64K - case 3: u.format3.init (c_.u.format3); return; - case 4: u.format4.init (c_.u.format4); return; + case 3: hb_barrier (); u.format3.init (c_.u.format3); return; + case 4: hb_barrier (); u.format4.init (c_.u.format4); return; #endif default: return; } @@ -298,11 +298,11 @@ struct Coverage { switch (format) { - case 1: return u.format1.__more__ (); - case 2: return u.format2.__more__ (); + case 1: hb_barrier (); return u.format1.__more__ (); + case 2: hb_barrier (); return u.format2.__more__ (); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.__more__ (); - case 4: return u.format4.__more__ (); + case 3: hb_barrier (); return u.format3.__more__ (); + case 4: hb_barrier (); return u.format4.__more__ (); #endif default:return false; } @@ -311,11 +311,11 @@ struct Coverage { switch (format) { - case 1: u.format1.__next__ (); break; - case 2: u.format2.__next__ (); break; + case 1: hb_barrier (); u.format1.__next__ (); break; + case 2: hb_barrier (); u.format2.__next__ (); break; #ifndef HB_NO_BEYOND_64K - case 3: u.format3.__next__ (); break; - case 4: u.format4.__next__ (); break; + case 3: hb_barrier (); u.format3.__next__ (); break; + case 4: hb_barrier (); u.format4.__next__ (); break; #endif default: break; } @@ -327,11 +327,11 @@ struct Coverage { switch (format) { - case 1: return u.format1.get_glyph (); - case 2: return u.format2.get_glyph (); + case 1: hb_barrier (); return u.format1.get_glyph (); + case 2: hb_barrier (); return u.format2.get_glyph (); #ifndef HB_NO_BEYOND_64K - case 3: return u.format3.get_glyph (); - case 4: return u.format4.get_glyph (); + case 3: hb_barrier (); return u.format3.get_glyph (); + case 4: hb_barrier (); return u.format4.get_glyph (); #endif default:return 0; } @@ -341,11 +341,11 @@ struct Coverage if (unlikely (format != o.format)) return true; switch (format) { - case 1: return u.format1 != o.u.format1; - case 2: return u.format2 != o.u.format2; + case 1: hb_barrier (); return u.format1 != o.u.format1; + case 2: hb_barrier (); return u.format2 != o.u.format2; #ifndef HB_NO_BEYOND_64K - case 3: return u.format3 != o.u.format3; - case 4: return u.format4 != o.u.format4; + case 3: hb_barrier (); return u.format3 != o.u.format3; + case 4: hb_barrier (); return u.format4 != o.u.format4; #endif default:return false; } @@ -356,11 +356,11 @@ struct Coverage it.format = format; switch (format) { - case 1: it.u.format1 = u.format1.__end__ (); break; - case 2: it.u.format2 = u.format2.__end__ (); break; + case 1: hb_barrier (); it.u.format1 = u.format1.__end__ (); break; + case 2: hb_barrier (); it.u.format2 = u.format2.__end__ (); break; #ifndef HB_NO_BEYOND_64K - case 3: it.u.format3 = u.format3.__end__ (); break; - case 4: it.u.format4 = u.format4.__end__ (); break; + case 3: hb_barrier (); it.u.format3 = u.format3.__end__ (); break; + case 4: hb_barrier (); it.u.format4 = u.format4.__end__ (); break; #endif default: break; } diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh index 85b3a40e1..5bea1c4e5 100644 --- a/src/OT/Layout/GDEF/GDEF.hh +++ b/src/OT/Layout/GDEF/GDEF.hh @@ -253,9 +253,9 @@ struct CaretValue const ItemVariationStore &var_store) const { switch (u.format.v) { - case 1: return u.format1.get_caret_value (font, direction); - case 2: return u.format2.get_caret_value (font, direction, glyph_id); - case 3: return u.format3.get_caret_value (font, direction, var_store); + case 1: hb_barrier (); return u.format1.get_caret_value (font, direction); + case 2: hb_barrier (); return u.format2.get_caret_value (font, direction, glyph_id); + case 3: hb_barrier (); return u.format3.get_caret_value (font, direction, var_store); default:return 0; } } @@ -266,9 +266,9 @@ struct CaretValue if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } @@ -280,6 +280,7 @@ struct CaretValue case 2: return; case 3: + hb_barrier (); u.format3.collect_variation_indices (c); return; default: return; @@ -292,9 +293,9 @@ struct CaretValue if (!u.format.v.sanitize (c)) return_trace (false); hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); - case 3: return_trace (u.format3.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); default:return_trace (true); } } @@ -520,7 +521,7 @@ struct MarkGlyphSets bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const { switch (u.format.v) { - case 1: return u.format1.covers (set_index, glyph_id); + case 1: hb_barrier (); return u.format1.covers (set_index, glyph_id); default:return false; } } @@ -529,7 +530,7 @@ struct MarkGlyphSets void collect_coverage (hb_vector_t &sets) const { switch (u.format.v) { - case 1: u.format1.collect_coverage (sets); return; + case 1: hb_barrier (); u.format1.collect_coverage (sets); return; default:return; } } @@ -538,7 +539,7 @@ struct MarkGlyphSets hb_set_t& used_mark_sets /* OUT */) const { switch (u.format.v) { - case 1: u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return; + case 1: hb_barrier (); u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return; default:return; } } @@ -547,7 +548,7 @@ struct MarkGlyphSets { TRACE_SUBSET (this); switch (u.format.v) { - case 1: return_trace (u.format1.subset (c)); + case 1: hb_barrier (); return_trace (u.format1.subset (c)); default:return_trace (false); } } @@ -558,7 +559,7 @@ struct MarkGlyphSets if (!u.format.v.sanitize (c)) return_trace (false); hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); default:return_trace (true); } } @@ -758,9 +759,9 @@ struct GDEF size_t get_size () const { switch (u.version.major) { - case 1: return u.version1.get_size (); + case 1: hb_barrier (); return u.version1.get_size (); #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.get_size (); + case 2: hb_barrier (); return u.version2.get_size (); #endif default: return u.version.static_size; } @@ -772,9 +773,9 @@ struct GDEF if (unlikely (!u.version.sanitize (c))) return_trace (false); hb_barrier (); switch (u.version.major) { - case 1: return_trace (u.version1.sanitize (c)); + case 1: hb_barrier (); return_trace (u.version1.sanitize (c)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (u.version2.sanitize (c)); + case 2: hb_barrier (); return_trace (u.version2.sanitize (c)); #endif default: return_trace (true); } @@ -783,9 +784,9 @@ struct GDEF bool subset (hb_subset_context_t *c) const { switch (u.version.major) { - case 1: return u.version1.subset (c); + case 1: hb_barrier (); return u.version1.subset (c); #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.subset (c); + case 2: hb_barrier (); return u.version2.subset (c); #endif default: return false; } @@ -794,9 +795,9 @@ struct GDEF bool has_glyph_classes () const { switch (u.version.major) { - case 1: return u.version1.glyphClassDef != 0; + case 1: hb_barrier (); return u.version1.glyphClassDef != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.glyphClassDef != 0; + case 2: hb_barrier (); return u.version2.glyphClassDef != 0; #endif default: return false; } @@ -804,9 +805,9 @@ struct GDEF const ClassDef &get_glyph_class_def () const { switch (u.version.major) { - case 1: return this+u.version1.glyphClassDef; + case 1: hb_barrier (); return this+u.version1.glyphClassDef; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.glyphClassDef; + case 2: hb_barrier (); return this+u.version2.glyphClassDef; #endif default: return Null(ClassDef); } @@ -814,9 +815,9 @@ struct GDEF bool has_attach_list () const { switch (u.version.major) { - case 1: return u.version1.attachList != 0; + case 1: hb_barrier (); return u.version1.attachList != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.attachList != 0; + case 2: hb_barrier (); return u.version2.attachList != 0; #endif default: return false; } @@ -824,9 +825,9 @@ struct GDEF const AttachList &get_attach_list () const { switch (u.version.major) { - case 1: return this+u.version1.attachList; + case 1: hb_barrier (); return this+u.version1.attachList; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.attachList; + case 2: hb_barrier (); return this+u.version2.attachList; #endif default: return Null(AttachList); } @@ -834,9 +835,9 @@ struct GDEF bool has_lig_carets () const { switch (u.version.major) { - case 1: return u.version1.ligCaretList != 0; + case 1: hb_barrier (); return u.version1.ligCaretList != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.ligCaretList != 0; + case 2: hb_barrier (); return u.version2.ligCaretList != 0; #endif default: return false; } @@ -844,9 +845,9 @@ struct GDEF const LigCaretList &get_lig_caret_list () const { switch (u.version.major) { - case 1: return this+u.version1.ligCaretList; + case 1: hb_barrier (); return this+u.version1.ligCaretList; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.ligCaretList; + case 2: hb_barrier (); return this+u.version2.ligCaretList; #endif default: return Null(LigCaretList); } @@ -854,9 +855,9 @@ struct GDEF bool has_mark_attachment_types () const { switch (u.version.major) { - case 1: return u.version1.markAttachClassDef != 0; + case 1: hb_barrier (); return u.version1.markAttachClassDef != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.markAttachClassDef != 0; + case 2: hb_barrier (); return u.version2.markAttachClassDef != 0; #endif default: return false; } @@ -864,9 +865,9 @@ struct GDEF const ClassDef &get_mark_attach_class_def () const { switch (u.version.major) { - case 1: return this+u.version1.markAttachClassDef; + case 1: hb_barrier (); return this+u.version1.markAttachClassDef; #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.markAttachClassDef; + case 2: hb_barrier (); return this+u.version2.markAttachClassDef; #endif default: return Null(ClassDef); } @@ -876,7 +877,7 @@ struct GDEF switch (u.version.major) { case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () && u.version1.markGlyphSetsDef != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.markGlyphSetsDef != 0; + case 2: hb_barrier (); return u.version2.markGlyphSetsDef != 0; #endif default: return false; } @@ -886,7 +887,7 @@ struct GDEF switch (u.version.major) { case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () ? this+u.version1.markGlyphSetsDef : Null(MarkGlyphSets); #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.markGlyphSetsDef; + case 2: hb_barrier (); return this+u.version2.markGlyphSetsDef; #endif default: return Null(MarkGlyphSets); } @@ -896,7 +897,7 @@ struct GDEF switch (u.version.major) { case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () && u.version1.varStore != 0; #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.varStore != 0; + case 2: hb_barrier (); return u.version2.varStore != 0; #endif default: return false; } @@ -906,7 +907,7 @@ struct GDEF switch (u.version.major) { case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () ? this+u.version1.varStore : Null(ItemVariationStore); #ifndef HB_NO_BEYOND_64K - case 2: return this+u.version2.varStore; + case 2: hb_barrier (); return this+u.version2.varStore; #endif default: return Null(ItemVariationStore); } diff --git a/src/OT/Layout/GPOS/Anchor.hh b/src/OT/Layout/GPOS/Anchor.hh index 1938803fa..48c509c25 100644 --- a/src/OT/Layout/GPOS/Anchor.hh +++ b/src/OT/Layout/GPOS/Anchor.hh @@ -27,9 +27,9 @@ struct Anchor if (!u.format.v.sanitize (c)) return_trace (false); hb_barrier (); switch (u.format.v) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); - case 3: return_trace (u.format3.sanitize (c)); + case 1: hb_barrier (); return_trace (u.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (u.format2.sanitize (c)); + case 3: hb_barrier (); return_trace (u.format3.sanitize (c)); default:return_trace (true); } } @@ -39,9 +39,9 @@ struct Anchor { *x = *y = 0; switch (u.format.v) { - case 1: u.format1.get_anchor (c, glyph_id, x, y); return; - case 2: u.format2.get_anchor (c, glyph_id, x, y); return; - case 3: u.format3.get_anchor (c, glyph_id, x, y); return; + case 1: hb_barrier (); u.format1.get_anchor (c, glyph_id, x, y); return; + case 2: hb_barrier (); u.format2.get_anchor (c, glyph_id, x, y); return; + case 3: hb_barrier (); u.format3.get_anchor (c, glyph_id, x, y); return; default: return; } } @@ -50,8 +50,9 @@ struct Anchor { TRACE_SUBSET (this); switch (u.format.v) { - case 1: return_trace (bool (reinterpret_cast (u.format1.copy (c->serializer)))); + case 1: hb_barrier (); return_trace (bool (reinterpret_cast (u.format1.copy (c->serializer)))); case 2: + hb_barrier (); if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING) { // AnchorFormat 2 just containins extra hinting information, so @@ -59,7 +60,7 @@ struct Anchor return_trace (bool (reinterpret_cast (u.format1.copy (c->serializer)))); } return_trace (bool (reinterpret_cast (u.format2.copy (c->serializer)))); - case 3: return_trace (u.format3.subset (c)); + case 3: hb_barrier (); return_trace (u.format3.subset (c)); default:return_trace (false); } } @@ -70,6 +71,7 @@ struct Anchor case 1: case 2: return; case 3: + hb_barrier (); u.format3.collect_variation_indices (c); return; default: return; diff --git a/src/OT/Layout/GPOS/CursivePos.hh b/src/OT/Layout/GPOS/CursivePos.hh index 38a29dd9e..e5e99cfaf 100644 --- a/src/OT/Layout/GPOS/CursivePos.hh +++ b/src/OT/Layout/GPOS/CursivePos.hh @@ -22,7 +22,7 @@ struct CursivePos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } diff --git a/src/OT/Layout/GPOS/MarkBasePos.hh b/src/OT/Layout/GPOS/MarkBasePos.hh index 32476663b..c0c9be9b1 100644 --- a/src/OT/Layout/GPOS/MarkBasePos.hh +++ b/src/OT/Layout/GPOS/MarkBasePos.hh @@ -25,9 +25,9 @@ struct MarkBasePos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/OT/Layout/GPOS/MarkLigPos.hh b/src/OT/Layout/GPOS/MarkLigPos.hh index 5c686f576..c3e56e2bf 100644 --- a/src/OT/Layout/GPOS/MarkLigPos.hh +++ b/src/OT/Layout/GPOS/MarkLigPos.hh @@ -25,9 +25,9 @@ struct MarkLigPos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/OT/Layout/GPOS/MarkMarkPos.hh b/src/OT/Layout/GPOS/MarkMarkPos.hh index dbd8419ca..ba1acc82e 100644 --- a/src/OT/Layout/GPOS/MarkMarkPos.hh +++ b/src/OT/Layout/GPOS/MarkMarkPos.hh @@ -25,9 +25,9 @@ struct MarkMarkPos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/OT/Layout/GPOS/PairPos.hh b/src/OT/Layout/GPOS/PairPos.hh index 1b3b70090..765db3a24 100644 --- a/src/OT/Layout/GPOS/PairPos.hh +++ b/src/OT/Layout/GPOS/PairPos.hh @@ -28,11 +28,11 @@ struct PairPos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.format4, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } diff --git a/src/OT/Layout/GPOS/PosLookupSubTable.hh b/src/OT/Layout/GPOS/PosLookupSubTable.hh index c19fbc323..4238f98f4 100644 --- a/src/OT/Layout/GPOS/PosLookupSubTable.hh +++ b/src/OT/Layout/GPOS/PosLookupSubTable.hh @@ -37,15 +37,15 @@ struct PosLookupSubTable { TRACE_DISPATCH (this, lookup_type); switch (lookup_type) { - case Single: return_trace (u.single.dispatch (c, std::forward (ds)...)); - case Pair: return_trace (u.pair.dispatch (c, std::forward (ds)...)); - case Cursive: return_trace (u.cursive.dispatch (c, std::forward (ds)...)); - case MarkBase: return_trace (u.markBase.dispatch (c, std::forward (ds)...)); - case MarkLig: return_trace (u.markLig.dispatch (c, std::forward (ds)...)); - case MarkMark: return_trace (u.markMark.dispatch (c, std::forward (ds)...)); - case Context: return_trace (u.context.dispatch (c, std::forward (ds)...)); - case ChainContext: return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); - case Extension: return_trace (u.extension.dispatch (c, std::forward (ds)...)); + case Single: hb_barrier (); return_trace (u.single.dispatch (c, std::forward (ds)...)); + case Pair: hb_barrier (); return_trace (u.pair.dispatch (c, std::forward (ds)...)); + case Cursive: hb_barrier (); return_trace (u.cursive.dispatch (c, std::forward (ds)...)); + case MarkBase: hb_barrier (); return_trace (u.markBase.dispatch (c, std::forward (ds)...)); + case MarkLig: hb_barrier (); return_trace (u.markLig.dispatch (c, std::forward (ds)...)); + case MarkMark: hb_barrier (); return_trace (u.markMark.dispatch (c, std::forward (ds)...)); + case Context: hb_barrier (); return_trace (u.context.dispatch (c, std::forward (ds)...)); + case ChainContext: hb_barrier (); return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); + case Extension: hb_barrier (); return_trace (u.extension.dispatch (c, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } diff --git a/src/OT/Layout/GPOS/SinglePos.hh b/src/OT/Layout/GPOS/SinglePos.hh index 30fc1aacd..ddf25e643 100644 --- a/src/OT/Layout/GPOS/SinglePos.hh +++ b/src/OT/Layout/GPOS/SinglePos.hh @@ -51,13 +51,13 @@ struct SinglePos u.format.v = format; switch (u.format.v) { - case 1: u.format1.serialize (c, + case 1: hb_barrier (); u.format1.serialize (c, src, glyph_val_iter_pairs, new_format, layout_variation_idx_delta_map); return; - case 2: u.format2.serialize (c, + case 2: hb_barrier (); u.format2.serialize (c, src, glyph_val_iter_pairs, new_format, @@ -73,8 +73,8 @@ struct SinglePos if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } diff --git a/src/OT/Layout/GSUB/AlternateSubst.hh b/src/OT/Layout/GSUB/AlternateSubst.hh index 08b1dbbee..ffe6432f2 100644 --- a/src/OT/Layout/GSUB/AlternateSubst.hh +++ b/src/OT/Layout/GSUB/AlternateSubst.hh @@ -26,9 +26,9 @@ struct AlternateSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -46,7 +46,7 @@ struct AlternateSubst unsigned int format = 1; u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, glyphs, alternate_len_list, alternate_glyphs_list)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, glyphs, alternate_len_list, alternate_glyphs_list)); default:return_trace (false); } } diff --git a/src/OT/Layout/GSUB/LigatureSubst.hh b/src/OT/Layout/GSUB/LigatureSubst.hh index 406d91eca..45e949299 100644 --- a/src/OT/Layout/GSUB/LigatureSubst.hh +++ b/src/OT/Layout/GSUB/LigatureSubst.hh @@ -26,9 +26,9 @@ struct LigatureSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -49,7 +49,7 @@ struct LigatureSubst unsigned int format = 1; u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, + case 1: hb_barrier (); return_trace (u.format1.serialize (c, first_glyphs, ligature_per_first_glyph_count_list, ligatures_list, diff --git a/src/OT/Layout/GSUB/MultipleSubst.hh b/src/OT/Layout/GSUB/MultipleSubst.hh index 2ff59ad97..adfb20aa8 100644 --- a/src/OT/Layout/GSUB/MultipleSubst.hh +++ b/src/OT/Layout/GSUB/MultipleSubst.hh @@ -27,9 +27,9 @@ struct MultipleSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -45,7 +45,7 @@ struct MultipleSubst unsigned int format = 1; u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, it)); + case 1: hb_barrier (); return_trace (u.format1.serialize (c, it)); default:return_trace (false); } } diff --git a/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh b/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh index e33148d77..0643a4870 100644 --- a/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh +++ b/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh @@ -23,7 +23,7 @@ struct ReverseChainSingleSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); default:return_trace (c->default_return_value ()); } } diff --git a/src/OT/Layout/GSUB/SingleSubst.hh b/src/OT/Layout/GSUB/SingleSubst.hh index 7ffe3a68b..a7b35369f 100644 --- a/src/OT/Layout/GSUB/SingleSubst.hh +++ b/src/OT/Layout/GSUB/SingleSubst.hh @@ -30,11 +30,11 @@ struct SingleSubst if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value (); TRACE_DISPATCH (this, u.format.v); switch (u.format.v) { - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.format4, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); #endif default:return_trace (c->default_return_value ()); } @@ -73,17 +73,17 @@ struct SingleSubst u.format.v = format; switch (u.format.v) { - case 1: return_trace (u.format1.serialize (c, + case 1: hb_barrier (); return_trace (u.format1.serialize (c, + glyphs | hb_map_retains_sorting (hb_first), delta)); - case 2: return_trace (u.format2.serialize (c, glyphs)); + case 2: hb_barrier (); return_trace (u.format2.serialize (c, glyphs)); #ifndef HB_NO_BEYOND_64K - case 3: return_trace (u.format3.serialize (c, + case 3: hb_barrier (); return_trace (u.format3.serialize (c, + glyphs | hb_map_retains_sorting (hb_first), delta)); - case 4: return_trace (u.format4.serialize (c, glyphs)); + case 4: hb_barrier (); return_trace (u.format4.serialize (c, glyphs)); #endif default:return_trace (false); } diff --git a/src/OT/Layout/GSUB/SubstLookup.hh b/src/OT/Layout/GSUB/SubstLookup.hh index d49dcc0e0..ca3d438a4 100644 --- a/src/OT/Layout/GSUB/SubstLookup.hh +++ b/src/OT/Layout/GSUB/SubstLookup.hh @@ -24,7 +24,7 @@ struct SubstLookup : Lookup bool is_reverse () const { unsigned int type = get_type (); - if (unlikely (type == SubTable::Extension)) + if (unlikely (type == SubTable::Extension) && hb_barrier ()) return get_subtable (0).u.extension.is_reverse (); return lookup_type_is_reverse (type); } diff --git a/src/OT/Layout/GSUB/SubstLookupSubTable.hh b/src/OT/Layout/GSUB/SubstLookupSubTable.hh index a525fba03..c36f0d7bf 100644 --- a/src/OT/Layout/GSUB/SubstLookupSubTable.hh +++ b/src/OT/Layout/GSUB/SubstLookupSubTable.hh @@ -50,14 +50,14 @@ struct SubstLookupSubTable { TRACE_DISPATCH (this, lookup_type); switch (lookup_type) { - case Single: return_trace (u.single.dispatch (c, std::forward (ds)...)); - case Multiple: return_trace (u.multiple.dispatch (c, std::forward (ds)...)); - case Alternate: return_trace (u.alternate.dispatch (c, std::forward (ds)...)); - case Ligature: return_trace (u.ligature.dispatch (c, std::forward (ds)...)); - case Context: return_trace (u.context.dispatch (c, std::forward (ds)...)); - case ChainContext: return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); - case Extension: return_trace (u.extension.dispatch (c, std::forward (ds)...)); - case ReverseChainSingle: return_trace (u.reverseChainContextSingle.dispatch (c, std::forward (ds)...)); + case Single: hb_barrier (); return_trace (u.single.dispatch (c, std::forward (ds)...)); + case Multiple: hb_barrier (); return_trace (u.multiple.dispatch (c, std::forward (ds)...)); + case Alternate: hb_barrier (); return_trace (u.alternate.dispatch (c, std::forward (ds)...)); + case Ligature: hb_barrier (); return_trace (u.ligature.dispatch (c, std::forward (ds)...)); + case Context: hb_barrier (); return_trace (u.context.dispatch (c, std::forward (ds)...)); + case ChainContext: hb_barrier (); return_trace (u.chainContext.dispatch (c, std::forward (ds)...)); + case Extension: hb_barrier (); return_trace (u.extension.dispatch (c, std::forward (ds)...)); + case ReverseChainSingle: hb_barrier (); return_trace (u.reverseChainContextSingle.dispatch (c, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } diff --git a/src/graph/gsubgpos-graph.hh b/src/graph/gsubgpos-graph.hh index 6cbea4703..dd6ed1bdd 100644 --- a/src/graph/gsubgpos-graph.hh +++ b/src/graph/gsubgpos-graph.hh @@ -414,9 +414,9 @@ struct GSTAR : public OT::GSUBGPOS const void* get_lookup_list_field_offset () const { switch (u.version.major) { - case 1: return u.version1.get_lookup_list_offset (); + case 1: hb_barrier (); return u.version1.get_lookup_list_offset (); #ifndef HB_NO_BEYOND_64K - case 2: return u.version2.get_lookup_list_offset (); + case 2: hb_barrier (); return u.version2.get_lookup_list_offset (); #endif default: return 0; } diff --git a/src/graph/ligature-graph.hh b/src/graph/ligature-graph.hh index 2a0f485ff..44f777be6 100644 --- a/src/graph/ligature-graph.hh +++ b/src/graph/ligature-graph.hh @@ -485,6 +485,7 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst { switch (u.format.v) { case 1: + hb_barrier (); return ((LigatureSubstFormat1*)(&u.format1))->split_subtables (c, this_index); #ifndef HB_NO_BEYOND_64K case 2: HB_FALLTHROUGH; @@ -503,6 +504,7 @@ struct LigatureSubst : public OT::Layout::GSUB_impl::LigatureSubst switch (u.format.v) { case 1: + hb_barrier (); return ((LigatureSubstFormat1*)(&u.format1))->sanitize (vertex); #ifndef HB_NO_BEYOND_64K case 2: HB_FALLTHROUGH; diff --git a/src/graph/markbasepos-graph.hh b/src/graph/markbasepos-graph.hh index a06ad277c..e476a90b8 100644 --- a/src/graph/markbasepos-graph.hh +++ b/src/graph/markbasepos-graph.hh @@ -480,6 +480,7 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos { switch (u.format.v) { case 1: + hb_barrier (); return ((MarkBasePosFormat1*)(&u.format1))->split_subtables (c, this_index); #ifndef HB_NO_BEYOND_64K case 2: HB_FALLTHROUGH; @@ -498,6 +499,7 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos switch (u.format.v) { case 1: + hb_barrier (); return ((MarkBasePosFormat1*)(&u.format1))->sanitize (vertex); #ifndef HB_NO_BEYOND_64K case 2: HB_FALLTHROUGH; diff --git a/src/graph/pairpos-graph.hh b/src/graph/pairpos-graph.hh index 5f9915bd9..65b170017 100644 --- a/src/graph/pairpos-graph.hh +++ b/src/graph/pairpos-graph.hh @@ -608,8 +608,10 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos { switch (u.format.v) { case 1: + hb_barrier (); return ((PairPosFormat1*)(&u.format1))->split_subtables (c, this_index); case 2: + hb_barrier (); return ((PairPosFormat2*)(&u.format2))->split_subtables (c, this_index); #ifndef HB_NO_BEYOND_64K case 3: HB_FALLTHROUGH; @@ -629,8 +631,10 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos switch (u.format.v) { case 1: + hb_barrier (); return ((PairPosFormat1*)(&u.format1))->sanitize (vertex); case 2: + hb_barrier (); return ((PairPosFormat2*)(&u.format2))->sanitize (vertex); #ifndef HB_NO_BEYOND_64K case 3: HB_FALLTHROUGH; diff --git a/src/hb-aat-layout-bsln-table.hh b/src/hb-aat-layout-bsln-table.hh index 8e42fab2e..02e5f9439 100644 --- a/src/hb-aat-layout-bsln-table.hh +++ b/src/hb-aat-layout-bsln-table.hh @@ -127,10 +127,10 @@ struct bsln switch (format) { - case 0: return_trace (parts.format0.sanitize (c)); - case 1: return_trace (parts.format1.sanitize (c)); - case 2: return_trace (parts.format2.sanitize (c)); - case 3: return_trace (parts.format3.sanitize (c)); + case 0: hb_barrier (); return_trace (parts.format0.sanitize (c)); + case 1: hb_barrier (); return_trace (parts.format1.sanitize (c)); + case 2: hb_barrier (); return_trace (parts.format2.sanitize (c)); + case 3: hb_barrier (); return_trace (parts.format3.sanitize (c)); default:return_trace (true); } } diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh index 7ff003f71..10ef74b9c 100644 --- a/src/hb-aat-layout-kerx-table.hh +++ b/src/hb-aat-layout-kerx-table.hh @@ -870,11 +870,11 @@ struct KerxSubTable unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case 0: return_trace (c->dispatch (u.format0, std::forward (ds)...)); - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); - case 2: return_trace (c->dispatch (u.format2, std::forward (ds)...)); - case 4: return_trace (c->dispatch (u.format4, std::forward (ds)...)); - case 6: return_trace (c->dispatch (u.format6, std::forward (ds)...)); + case 0: hb_barrier (); return_trace (c->dispatch (u.format0, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward (ds)...)); + case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward (ds)...)); + case 6: hb_barrier (); return_trace (c->dispatch (u.format6, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } @@ -884,11 +884,11 @@ struct KerxSubTable { unsigned int subtable_type = get_type (); switch (subtable_type) { - case 0: u.format0.collect_glyphs (first_set, second_set, num_glyphs); return; - case 1: u.format1.collect_glyphs (first_set, second_set, num_glyphs); return; - case 2: u.format2.collect_glyphs (first_set, second_set, num_glyphs); return; - case 4: u.format4.collect_glyphs (first_set, second_set, num_glyphs); return; - case 6: u.format6.collect_glyphs (first_set, second_set, num_glyphs); return; + case 0: hb_barrier (); u.format0.collect_glyphs (first_set, second_set, num_glyphs); return; + case 1: hb_barrier (); u.format1.collect_glyphs (first_set, second_set, num_glyphs); return; + case 2: hb_barrier (); u.format2.collect_glyphs (first_set, second_set, num_glyphs); return; + case 4: hb_barrier (); u.format4.collect_glyphs (first_set, second_set, num_glyphs); return; + case 6: hb_barrier (); u.format6.collect_glyphs (first_set, second_set, num_glyphs); return; default: return; } } diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index fc09af240..4811f12be 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -1078,11 +1078,11 @@ struct ChainSubtable unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case Rearrangement: return_trace (c->dispatch (u.rearrangement, std::forward (ds)...)); - case Contextual: return_trace (c->dispatch (u.contextual, std::forward (ds)...)); - case Ligature: return_trace (c->dispatch (u.ligature, std::forward (ds)...)); - case Noncontextual: return_trace (c->dispatch (u.noncontextual, std::forward (ds)...)); - case Insertion: return_trace (c->dispatch (u.insertion, std::forward (ds)...)); + case Rearrangement: hb_barrier (); return_trace (c->dispatch (u.rearrangement, std::forward (ds)...)); + case Contextual: hb_barrier (); return_trace (c->dispatch (u.contextual, std::forward (ds)...)); + case Ligature: hb_barrier (); return_trace (c->dispatch (u.ligature, std::forward (ds)...)); + case Noncontextual: hb_barrier (); return_trace (c->dispatch (u.noncontextual, std::forward (ds)...)); + case Insertion: hb_barrier (); return_trace (c->dispatch (u.insertion, std::forward (ds)...)); default: return_trace (c->default_return_value ()); } } diff --git a/src/hb-open-file.hh b/src/hb-open-file.hh index 58d2cdec9..a1c6b4289 100644 --- a/src/hb-open-file.hh +++ b/src/hb-open-file.hh @@ -474,8 +474,8 @@ struct OpenTypeFontFile case TrueTag: case Typ1Tag: case TrueTypeTag: return 1; - case TTCTag: return u.ttcHeader.get_face_count (); - case DFontTag: return u.rfHeader.get_face_count (); + case TTCTag: hb_barrier (); return u.ttcHeader.get_face_count (); + case DFontTag: hb_barrier (); return u.rfHeader.get_face_count (); default: return 0; } } @@ -490,9 +490,9 @@ struct OpenTypeFontFile case CFFTag: /* All the non-collection tags */ case TrueTag: case Typ1Tag: - case TrueTypeTag: return u.fontFace; - case TTCTag: return u.ttcHeader.get_face (i); - case DFontTag: return u.rfHeader.get_face (i, base_offset); + case TrueTypeTag: hb_barrier (); return u.fontFace; + case TTCTag: hb_barrier (); return u.ttcHeader.get_face (i); + case DFontTag: hb_barrier (); return u.rfHeader.get_face (i, base_offset); default: return Null (OpenTypeFontFace); } } @@ -518,9 +518,9 @@ struct OpenTypeFontFile case CFFTag: /* All the non-collection tags */ case TrueTag: case Typ1Tag: - case TrueTypeTag: return_trace (u.fontFace.sanitize (c)); - case TTCTag: return_trace (u.ttcHeader.sanitize (c)); - case DFontTag: return_trace (u.rfHeader.sanitize (c)); + case TrueTypeTag: hb_barrier (); return_trace (u.fontFace.sanitize (c)); + case TTCTag: hb_barrier (); return_trace (u.ttcHeader.sanitize (c)); + case DFontTag: hb_barrier (); return_trace (u.rfHeader.sanitize (c)); default: return_trace (true); } } diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 0cc4d45f5..91be90fe5 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -2059,7 +2059,7 @@ struct cmap this->subtable_uvs = &Null (CmapSubtableFormat14); { const CmapSubtable *st = table->find_subtable (0, 5); - if (st && st->u.format.v == 14) + if (st && st->u.format.v == 14 && hb_barrier ()) subtable_uvs = &st->u.format14; } @@ -2141,6 +2141,7 @@ struct cmap break; case 4: { + hb_barrier (); this->format4_accel.init (&subtable->u.format4, get_subtable_data_size (subtable)); this->get_glyph_data = &this->format4_accel; diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh index d042c8805..26480b4c9 100644 --- a/src/hb-ot-kern-table.hh +++ b/src/hb-ot-kern-table.hh @@ -144,13 +144,13 @@ struct KernSubTable unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case 0: return_trace (c->dispatch (u.format0)); + case 0: hb_barrier (); return_trace (c->dispatch (u.format0)); #ifndef HB_NO_AAT_SHAPE - case 1: return_trace (c->dispatch (u.format1, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward (ds)...)); #endif - case 2: return_trace (c->dispatch (u.format2)); + case 2: hb_barrier (); return_trace (c->dispatch (u.format2)); #ifndef HB_NO_AAT_SHAPE - case 3: return_trace (c->dispatch (u.format3, std::forward (ds)...)); + case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward (ds)...)); #endif default: return_trace (c->default_return_value ()); } @@ -161,10 +161,10 @@ struct KernSubTable { unsigned int subtable_type = get_type (); switch (subtable_type) { - case 0: u.format0.collect_glyphs (left_set, right_set, num_glyphs); return; - case 1: u.format1.collect_glyphs (left_set, right_set, num_glyphs); return; - case 2: u.format2.collect_glyphs (left_set, right_set, num_glyphs); return; - case 3: u.format3.collect_glyphs (left_set, right_set, num_glyphs); return; + case 0: hb_barrier (); u.format0.collect_glyphs (left_set, right_set, num_glyphs); return; + case 1: hb_barrier (); u.format1.collect_glyphs (left_set, right_set, num_glyphs); return; + case 2: hb_barrier (); u.format2.collect_glyphs (left_set, right_set, num_glyphs); return; + case 3: hb_barrier (); u.format3.collect_glyphs (left_set, right_set, num_glyphs); return; default: return; } } @@ -352,9 +352,9 @@ struct kern unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); switch (subtable_type) { - case 0: return_trace (c->dispatch (u.ot, std::forward (ds)...)); + case 0: hb_barrier (); return_trace (c->dispatch (u.ot, std::forward (ds)...)); #ifndef HB_NO_AAT_SHAPE - case 1: return_trace (c->dispatch (u.aat, std::forward (ds)...)); + case 1: hb_barrier (); return_trace (c->dispatch (u.aat, std::forward (ds)...)); #endif default: return_trace (c->default_return_value ()); } diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index ba263c825..8c6e19b04 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -706,7 +706,7 @@ struct FeatureParams return true; #endif TRACE_SANITIZE (this); - if (tag == HB_TAG ('s','i','z','e')) + if (tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return_trace (u.size.sanitize (c)); if ((tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */ return_trace (u.stylisticSet.sanitize (c)); @@ -720,7 +720,7 @@ struct FeatureParams #ifdef HB_NO_LAYOUT_FEATURE_PARAMS return; #endif - if (tag == HB_TAG ('s','i','z','e')) + if (tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return (u.size.collect_name_ids (nameids_to_retain)); if ((tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */ return (u.stylisticSet.collect_name_ids (nameids_to_retain)); @@ -732,7 +732,7 @@ struct FeatureParams { TRACE_SUBSET (this); if (!tag) return_trace (false); - if (*tag == HB_TAG ('s','i','z','e')) + if (*tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return_trace (u.size.subset (c)); if ((*tag & 0xFFFF0000u) == HB_TAG ('s','s','\0','\0')) /* ssXX */ return_trace (u.stylisticSet.subset (c)); @@ -744,7 +744,7 @@ struct FeatureParams #ifndef HB_NO_LAYOUT_FEATURE_PARAMS const FeatureParamsSize& get_size_params (hb_tag_t tag) const { - if (tag == HB_TAG ('s','i','z','e')) + if (tag == HB_TAG ('s','i','z','e') && hb_barrier ()) return u.size; return Null (FeatureParamsSize); } @@ -4955,10 +4955,12 @@ struct Device { #ifndef HB_NO_HINTING case 1: case 2: case 3: + hb_barrier (); return u.hinting.get_x_delta (font); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return u.variation.get_x_delta (font, store, store_cache); #endif default: @@ -4973,10 +4975,12 @@ struct Device { case 1: case 2: case 3: #ifndef HB_NO_HINTING + hb_barrier (); return u.hinting.get_y_delta (font); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return u.variation.get_y_delta (font, store, store_cache); #endif default: @@ -4991,10 +4995,12 @@ struct Device switch (u.b.format) { #ifndef HB_NO_HINTING case 1: case 2: case 3: + hb_barrier (); return_trace (u.hinting.sanitize (c)); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return_trace (u.variation.sanitize (c)); #endif default: @@ -5011,10 +5017,12 @@ struct Device case 1: case 2: case 3: + hb_barrier (); return_trace (reinterpret_cast (u.hinting.copy (c))); #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return_trace (reinterpret_cast (u.variation.copy (c, layout_variation_idx_delta_map))); #endif default: @@ -5033,6 +5041,7 @@ struct Device #endif #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); u.variation.collect_variation_index (c); return; #endif @@ -5046,6 +5055,7 @@ struct Device switch (u.b.format) { #ifndef HB_NO_VAR case 0x8000: + hb_barrier (); return u.variation.varIdx; #endif default: diff --git a/test/api/test-ot-layout.c b/test/api/test-ot-layout.c index c3fe0ce74..27522c780 100644 --- a/test/api/test-ot-layout.c +++ b/test/api/test-ot-layout.c @@ -27,8 +27,49 @@ #include #include +#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) && defined(HAVE_MMAP) +#ifdef HAVE_UNISTD_H +#include +#endif +#include +#endif + #define STATIC_ARRAY_SIZE 255 +#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) && defined(HAVE_MMAP) +static void +test_ot_layout_gdef_unsupported_version (void) +{ + const char gdef[] = {0x87, 0x00, 0x00, 0x06, 0x30}; + long pagesize = sysconf (_SC_PAGESIZE); + char *mapping; + char *table; + hb_blob_t *blob; + hb_face_t *face; + + g_assert_cmpint (pagesize, >, 0); + mapping = mmap (NULL, 2 * pagesize, PROT_NONE, + MAP_PRIVATE | MAP_ANON, -1, 0); + g_assert_true (mapping != MAP_FAILED); + g_assert_cmpint (mprotect (mapping, pagesize, PROT_READ | PROT_WRITE), ==, 0); + + table = mapping + pagesize - sizeof (gdef); + memcpy (table, gdef, sizeof (gdef)); + g_assert_cmpint (mprotect (mapping, pagesize, PROT_READ), ==, 0); + + face = hb_face_builder_create (); + blob = hb_blob_create (table, sizeof (gdef), HB_MEMORY_MODE_READONLY, + NULL, NULL); + g_assert_true (hb_face_builder_add_table (face, HB_OT_TAG_GDEF, blob)); + hb_blob_destroy (blob); + + g_assert_false (hb_ot_layout_has_glyph_classes (face)); + + hb_face_destroy (face); + g_assert_cmpint (munmap (mapping, 2 * pagesize), ==, 0); +} +#endif + static void test_ot_layout_table_get_script_tags (void) { @@ -219,6 +260,9 @@ int main (int argc, char **argv) { hb_test_init (&argc, &argv); +#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) && defined(HAVE_MMAP) + hb_test_add (test_ot_layout_gdef_unsupported_version); +#endif hb_test_add (test_ot_layout_table_get_script_tags); hb_test_add (test_ot_layout_table_find_script); hb_test_add (test_ot_layout_script_get_language_tags); From 8c9307b59abad48fa48117a8731fba9a86976643 Mon Sep 17 00:00:00 2001 From: nussaibah shaikh Date: Wed, 29 Jul 2026 14:29:29 +0530 Subject: [PATCH 107/112] [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 that saturates a floating-point value to the range of any integer type, and use hb_clamp_to at the three raster call sites. Signed-off-by: nussaiba shaikh --------- Signed-off-by: nussaiba shaikh --- src/hb-algs.hh | 12 ++++++++++++ src/hb-raster-draw.cc | 20 ++++++++++---------- src/hb-raster-paint.cc | 12 ++++++------ test/api/test-raster.cc | 25 +++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/hb-algs.hh b/src/hb-algs.hh index f61ac439f..c441f4a1d 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -890,6 +890,18 @@ struct } HB_FUNCOBJ (hb_clamp); +/* Convert a floating-point value to integer type T, saturating to T's + * range instead of relying on the undefined behavior of an out-of-range + * float-to-int conversion. NaN saturates to the minimum of T. */ +template +static inline T +hb_clamp_to (double v) +{ + return (T) hb_clamp (v, + (double) hb_int_min (T), + (double) hb_int_max (T)); +} + /* * Bithacks. */ diff --git a/src/hb-raster-draw.cc b/src/hb-raster-draw.cc index ba067561a..3b77fea1b 100644 --- a/src/hb-raster-draw.cc +++ b/src/hb-raster-draw.cc @@ -382,10 +382,10 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw, ty_max = hb_max (ty_max, ty); } - int ex0 = (int) floorf (tx_min); - int ey0 = (int) floorf (ty_min); - int ex1 = (int) ceilf (tx_max); - int ey1 = (int) ceilf (ty_max); + int32_t ex0 = hb_clamp_to (floorf (tx_min)); + int32_t ey0 = hb_clamp_to (floorf (ty_min)); + int32_t ex1 = hb_clamp_to (ceilf (tx_max)); + int32_t ey1 = hb_clamp_to (ceilf (ty_max)); if (ex1 <= ex0 || ey1 <= ey0) { @@ -396,8 +396,8 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw, draw->fixed_extents = { ex0, ey0, - (unsigned) (ex1 - ex0), - (unsigned) (ey1 - ey0), + (unsigned) ((int64_t) ex1 - ex0), + (unsigned) ((int64_t) ey1 - ey0), 0 }; draw->has_extents = true; @@ -483,10 +483,10 @@ emit_segment (hb_raster_draw_t *draw, float x0, float y0, float x1, float y1) { - int32_t X0 = (int32_t) roundf (x0 * HB_RASTER_ONE_PIXEL); - int32_t Y0 = (int32_t) roundf (y0 * HB_RASTER_ONE_PIXEL); - int32_t X1 = (int32_t) roundf (x1 * HB_RASTER_ONE_PIXEL); - int32_t Y1 = (int32_t) roundf (y1 * HB_RASTER_ONE_PIXEL); + int32_t X0 = hb_clamp_to (roundf (x0 * HB_RASTER_ONE_PIXEL)); + int32_t Y0 = hb_clamp_to (roundf (y0 * HB_RASTER_ONE_PIXEL)); + int32_t X1 = hb_clamp_to (roundf (x1 * HB_RASTER_ONE_PIXEL)); + int32_t Y1 = hb_clamp_to (roundf (y1 * HB_RASTER_ONE_PIXEL)); if (Y0 == Y1) return; /* horizontal — skip */ diff --git a/src/hb-raster-paint.cc b/src/hb-raster-paint.cc index 29fe02add..779c3d99c 100644 --- a/src/hb-raster-paint.cc +++ b/src/hb-raster-paint.cc @@ -2081,10 +2081,10 @@ hb_raster_paint_set_glyph_extents (hb_raster_paint_t *paint, ty_max = hb_max (ty_max, py[i]); } - int ex0 = (int) floorf (tx_min); - int ey0 = (int) floorf (ty_min); - int ex1 = (int) ceilf (tx_max); - int ey1 = (int) ceilf (ty_max); + int32_t ex0 = hb_clamp_to (floorf (tx_min)); + int32_t ey0 = hb_clamp_to (floorf (ty_min)); + int32_t ex1 = hb_clamp_to (ceilf (tx_max)); + int32_t ey1 = hb_clamp_to (ceilf (ty_max)); if (ex1 <= ex0 || ey1 <= ey0) { @@ -2095,8 +2095,8 @@ hb_raster_paint_set_glyph_extents (hb_raster_paint_t *paint, paint->fixed_extents = { ex0, ey0, - (unsigned) (ex1 - ex0), - (unsigned) (ey1 - ey0), + (unsigned) ((int64_t) ex1 - ex0), + (unsigned) ((int64_t) ey1 - ey0), 0 }; paint->has_extents = true; diff --git a/test/api/test-raster.cc b/test/api/test-raster.cc index a07baee8d..f82f91583 100644 --- a/test/api/test-raster.cc +++ b/test/api/test-raster.cc @@ -262,6 +262,30 @@ test_image_nonfinite_transform (void) hb_raster_paint_destroy (paint); } +/* ── Test 7: glyph extents that overflow the int grid ────────────── */ + +/* Glyph extents are int32, so a transform that scales them up puts the + * corner coordinates far outside the int range before they are floored + * back to the integer pixel grid. Exercised for the conversion itself, + * so this needs a sanitizer build to catch a regression. */ +static void +test_set_glyph_extents_overflow (void) +{ + hb_glyph_extents_t gext = {-2000000000, 2000000000, 2000000000, -2000000000}; + + hb_raster_draw_t *rdr = hb_raster_draw_create_or_fail (); + g_assert_nonnull (rdr); + hb_raster_draw_set_transform (rdr, 1000.f, 0.f, 0.f, 1000.f, 0.f, 0.f); + hb_raster_draw_set_glyph_extents (rdr, &gext); + hb_raster_draw_destroy (rdr); + + hb_raster_paint_t *paint = hb_raster_paint_create_or_fail (); + g_assert_nonnull (paint); + hb_raster_paint_set_transform (paint, 1000.f, 0.f, 0.f, 1000.f, 0.f, 0.f); + hb_raster_paint_set_glyph_extents (paint, &gext); + hb_raster_paint_destroy (paint); +} + /* ── main ────────────────────────────────────────────────────────── */ int @@ -275,6 +299,7 @@ main (int argc, char **argv) hb_test_add (test_transform); hb_test_add (test_set_glyph_extents_with_transform); hb_test_add (test_image_nonfinite_transform); + hb_test_add (test_set_glyph_extents_overflow); return hb_test_run (); } From f26e0cd4ed059f905c2f278fbcfa5da679b737b1 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 29 Jul 2026 11:29:23 -0600 Subject: [PATCH 108/112] [instancer] Fix HVAR partial instancing for map-less advance mappings (#6070) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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. --- src/hb-ot-var-common.hh | 12 +++++++--- src/hb-ot-var-hvar-table.hh | 21 +++++++++++++++++- ...HVAR.default.41,42,43.wght=200-400-800.ttf | Bin 0 -> 800 bytes ...icitHVAR.default.41,42,43.wght=300-600.ttf | Bin 0 -> 800 bytes ...licitHVAR.default.all.wght=200-400-800.ttf | Bin 0 -> 864 bytes .../ImplicitHVAR.default.all.wght=300-600.ttf | Bin 0 -> 864 bytes ...SansJP-VF.subset.retain-num-glyphs.all.otf | Bin 4024 -> 4016 bytes test/subset/data/fonts/ImplicitHVAR.ttf | Bin 0 -> 968 bytes .../hvar_partial_instance_implicit_map.tests | 13 +++++++++++ test/subset/meson.build | 1 + 10 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=200-400-800.ttf create mode 100644 test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=300-600.ttf create mode 100644 test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=200-400-800.ttf create mode 100644 test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=300-600.ttf create mode 100644 test/subset/data/fonts/ImplicitHVAR.ttf create mode 100644 test/subset/data/tests/hvar_partial_instance_implicit_map.tests diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index e9ba284ca..2121dd234 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -1964,10 +1964,16 @@ struct item_variations_t if (!front_mapping.set ((major<<16) + minor, &row)) return false; - if (delta_rows_map.has (&row)) - continue; + /* Duplicate rows may only be dropped when optimizing: without a + * varidx_map the caller relies on original VariationIndex values + * staying valid (e.g. HVAR/VVAR with an implicit advance mapping). */ + if (optimize) + { + if (delta_rows_map.has (&row)) + continue; - delta_rows_map.set (&row, 1); + delta_rows_map.set (&row, 1); + } major_rows.push (&row); } diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh index f7be19e93..dda30eca8 100644 --- a/src/hb-ot-var-hvar-table.hh +++ b/src/hb-ot-var-hvar-table.hh @@ -49,6 +49,12 @@ struct index_map_subset_plan_t bool bypass_empty = true) { map_count = 0; + full_map_count = plan->new_to_old_gid_list.length ? + plan->new_to_old_gid_list.tail ().first + 1 : 0; + /* Only the advance mapping may be dropped in favor of implicit + * glyph-id indexing (for the others a null offset means no deltas), + * and only when the source was map-less too, preserving its form. */ + can_drop_to_implicit = !bypass_empty && !index_map; max_inners.init (); output_map.init (); @@ -187,11 +193,24 @@ struct index_map_subset_plan_t DeltaSetIndexMap::min_size); } - bool is_identity () const { return get_output_map ().length == 0; } + bool is_identity () const + { + if (!output_map) return true; + /* An advance map whose entries are the identity over every output + * glyph is equivalent to implicit glyph-id indexing; drop it. A + * truncated map doesn't qualify: glyphs past its end share its last + * value, not their own ids. */ + if (!can_drop_to_implicit || map_count != full_map_count) return false; + for (unsigned i = 0; i < map_count; i++) + if (output_map.arrayZ[i] != i) return false; + return true; + } hb_array_t get_output_map () const { return output_map.as_array (); } protected: unsigned int map_count; + unsigned int full_map_count; + bool can_drop_to_implicit; hb_vector_t max_inners; unsigned int outer_bit_count; unsigned int inner_bit_count; diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=200-400-800.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.41,42,43.wght=200-400-800.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0561b7734b41f354021a0d32087914d25c5d51ab GIT binary patch literal 800 zcmaJf~TzCo22QIL*Ha(-uHcP-g`3}C;(~f!bGvO>3sN3oN2ZyF7kLn{~PC^?`{WpzyaKFWq6x1P3RzaxvBn{jy_Hx7@MmVD0vV}jtJ`ihkvo>)CbgxS#Z|Ie>?+IsZ+A0MMC3$K zbk;pDQ4$w7;fA%I=1E-}mX#($rO46ci0*#wU%Y!f^#`UY?}+Q2+11{z`!s$Lo4PX* zlTsdi%|0%a|<#W3vikOL<+%_@548#0F9pAts{-3nZ zHq(q-MimXz;UUBV{W?CP2^Z^_g^z%K0~O8?B`m>VjA@ws21)$}y3~Ibd9$8P(+C{Q K^r(I(3)}-0IAVDK literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=200-400-800.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=200-400-800.ttf new file mode 100644 index 0000000000000000000000000000000000000000..97c16721dbc96a277d3c1fe5d93391bbe758a693 GIT binary patch literal 864 zcmah{O-mb56g@MOND5JFh!CWU5rhU8Z5e_MA~XXEanoW1TSU+yO)`Ou4tCTOLW%wY zan)5<{Q+IHP)aGql?&HdDY&teE(Ae0f-{~whB&zCP40X5+;czPyKkTXNTLl5h2nx) zDtPuJp!}sb|7!lJVdl+GfZ8HnDLaY% zEvFJc9dcP;Cth;b-g!JXMM-nf#X>(u@EAFm^fHTTs0r#L>NDyz49K1P5DRw}3-h8& zSTpLlXG{J=<|&ZAiLILL;efq%0Zo@!2Jo-xL7wHMqoJm{-GsgsxtH{oZfUMkHO*7$ z++*F-%>)6F83e)aZoWiOe|^}#ULKsfgr><`;ZJLJvA2i))H7l&>>z~XN&TpZZzN=r z;gkhuvl(RRqg~*SqG4Q47kfZohVi$yiUEELq0P`F<6fhJI%=@tp+vjJw`{<|I%eU( zrCmpv>Y<1QzE267I?S2HdDs7ooUJD>CEdanD1PKP3sSN1sx&iMK0(5Rv8`mUk= j>@uAw^VwgzWBx^%?|$))@uSS4pX)JdD$1Prx-hr_0}gU) literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=300-600.ttf b/test/subset/data/expected/hvar_partial_instance_implicit_map/ImplicitHVAR.default.all.wght=300-600.ttf new file mode 100644 index 0000000000000000000000000000000000000000..35af082a6cfea4651a827ce20178b970c5ee61f4 GIT binary patch literal 864 zcmah{Pe>GD6#soQyRyQhDI_NN- z(jhu^>g1_IK}4W<_Pi$pFG_gmRF@7j{oc5YgO}d!`@Z*kzxU^R-#1VI4D3Khxw7O` z%L`AY0rivK(xb&0+bKC80Ifs3TJzn2vG2(XE;e4f>zy~Px5P!_iDrAd(f#r5G2>5& zcfGp%V!GP>O#Tz`U5}1@LwzA$mUzz(w~QV9r7iKJ?X{YV4LqcMOdasutpEk|(f&=f zUb=oge>N1bzD2weti1|(Zi+IwSYqJ@#xRK@9D12WwY38E7WEGG0c^<3eaIy{izRv4 zC8?QpT(c$rCi4`eZ(+0Pg=&hu_E=0NlfwM#R$QV-I@;QBuba@9B6CS^>1J}3swPim zanJQmHy6i5P8`RFy?lwH9=zKhc|JJ%2f8kAh4aq*vvg1TX}^f|bUMkC`dJa*SW?$W zZdtHt8jMonE%Qgwaa&H8>!)v&@t3xS0e%aK%}|4JPf;Fa0mdbq!frGi!b=|P&P;&F?h&RDIzBfKJZmYd0u(j_! hrkiCxMk`m$MV9#*Rj!yQ%N$3=l+lK>%xPo^gMXWeaBTnp literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/retain-num-glyphs/NotoSansJP-VF.subset.retain-num-glyphs.all.otf b/test/subset/data/expected/retain-num-glyphs/NotoSansJP-VF.subset.retain-num-glyphs.all.otf index 8105e790732587ca00b44bdd4f3105b584f40d57..43e8bcc600f5c390fc2befc147c2441097490f37 100644 GIT binary patch delta 194 zcmdlXzd?S2IOBzh67q&S7#J8FJi;7<7^E1K7#JA80Qp+}!TLsvKd)NGz`*PRIfkj|qhPP|!HBEU~D!x`&a0fk^?RDLFT>V1fC9W+49uknfWQl<)2; ztpFOb1jx_INKH&p;9;u)$~R0rVb6GCG6&;lRS}>R0sswT5Mlt4JPd4LVGx^P@)yQb Sb|ywPgJo%)o2M|T@B#pOQY!uc delta 208 zcmdlWze9e4IOC0p67q%z7#J8FJi;7=kb(Jb2DXc#(Rt<~pL1+Ul?uz(h3#}AE!#2AKBsQ$6R_URL zM-Rn|3gXE>L7}LJ;#tAdo)kQZ^dJa&@sRjUvSt^dIFFh4zWL_m&Ac~(0$>MLq2cn> zO#K`YJ=zB6LT%P;bdFCxCSD+}UYa>!m{s#RL#`6vX!=%wBAyU`B(Ah>Tb-33?jy!O zBQCeSyRGi$*H-|wM10?|t%dPM_a)b#sHYt|hFZ!i?iar7_~CMK6~BqsiATM~riCS3 zjb|WB%^!$7t$aWer1&_`gV= znM_a!OiX94e-}Da{F$hs7MTA*>Pf0(%cQ9qwL~jlE-?q4bB;ssbR5%~aU5^-vL|E@ z9Kcajc&^mXs+D)V6@KT;*vOcntVMyLzU?vHLFPqtt2vJ$?a$7 ze2H{nMDl!j$yf3zCRWxewh<+MnmqPMmAUQojADOptzsCb(luj>n5g@K=QiC?I=W%E zmprR8XS;1DL>)c?cyQ6AhNxkdSJ2?F(Pr~`u+YIAkxT3_BFRDQ*1`@&8HaI%H+qcg xv Date: Fri, 6 Mar 2026 04:01:40 -0600 Subject: [PATCH 109/112] hardcoded version string to lock shared library object name for aix platform --- src/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/meson.build b/src/meson.build index cf4582e60..9437a26e3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -645,6 +645,10 @@ else hb_so_version = '0' endif +if host_machine.system() == 'aix' + version = '0' +endif + if get_option('fuzzer_ldflags') != '' extra_hb_cpp_args += ['-DHB_CUSTOM_MALLOC'] hb_sources += hb_failing_alloc_sources From d8617e1e911a99915b3ffa72688f7eb338242295 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 30 Jul 2026 10:49:20 -0600 Subject: [PATCH 110/112] Fix an API nullable crash Fixes https://github.com/harfbuzz/harfbuzz/issues/6112 --- src/hb-ot-layout.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index ea1ef1905..72d5c49b4 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -975,7 +975,7 @@ hb_ot_layout_language_get_feature_tags (hb_face_t *face, static_assert ((sizeof (unsigned int) == sizeof (hb_tag_t)), ""); unsigned int ret = l.get_feature_indexes (start_offset, feature_count, (unsigned int *) feature_tags); - if (feature_tags) { + if (feature_count && feature_tags) { unsigned int count = *feature_count; for (unsigned int i = 0; i < count; i++) feature_tags[i] = g.get_feature_tag ((unsigned int) feature_tags[i]); From 5ce238e297787a8168fb7d9db30ac68336ae3838 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 30 Jul 2026 11:16:45 -0600 Subject: [PATCH 111/112] [subset-serialize] Fix include --- src/hb-subset-serialize.h | 4 ++++ src/hb-subset.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/hb-subset-serialize.h b/src/hb-subset-serialize.h index 9035d4ced..c906eaed5 100644 --- a/src/hb-subset-serialize.h +++ b/src/hb-subset-serialize.h @@ -26,6 +26,10 @@ #ifndef HB_SUBSET_SERIALIZE_H #define HB_SUBSET_SERIALIZE_H +#if !defined(HB_SUBSET_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR) +#warning "Include instead." +#endif + #include "hb.h" HB_BEGIN_DECLS diff --git a/src/hb-subset.h b/src/hb-subset.h index 6e3a34d05..53f64233c 100644 --- a/src/hb-subset.h +++ b/src/hb-subset.h @@ -31,6 +31,7 @@ #include "hb.h" #include "hb-ot.h" #include "hb-subset-depend.h" +#include "hb-subset-serialize.h" #undef HB_SUBSET_H_IN From df5ce0d587ca4f3b6d35364be3a66bd9bfe7f04f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 30 Jul 2026 11:18:06 -0600 Subject: [PATCH 112/112] [config] Remove obsolete HB_SUBSET_DEPEND_API --- src/hb-config.hh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hb-config.hh b/src/hb-config.hh index 94e9d2b5b..dca05b728 100644 --- a/src/hb-config.hh +++ b/src/hb-config.hh @@ -41,10 +41,6 @@ #define HB_NO_SUBSET_DEPEND #endif -#ifdef HB_SUBSET_DEPEND_API -#undef HB_NO_SUBSET_DEPEND -#endif - #ifdef HB_TINY #define HB_LEAN #define HB_MINI