From ef64f7ea8bf80835413e315779b1fcb46320c13e Mon Sep 17 00:00:00 2001 From: Mar Date: Wed, 14 Oct 2026 01:18:25 -0600 Subject: [PATCH] [font] Reset font funcs in hb_font_set_face() Font funcs and their data may hold pointers into the font's face. hb_font_set_face() released the old face but kept those funcs, causing stale lookups or a use-after-free when the last face reference was gone. Release the font funcs and their data while the old face is still alive, then install the default funcs for the new face. Preserve the other font properties and document the callback reset in the API docs and NEWS. Add regressions for OpenType lookups and custom font-data destruction. Reproduced stale glyph lookup and the heap-use-after-free under ASan before the fix. The full ASan Meson suite passes (270 passed, 1 skipped), and the two regressions also pass with HB_FONT_FUNCS=ft. Assisted-by: Claude Assisted-by: Codex --- NEWS | 4 +++ src/hb-font.cc | 9 +++++ test/api/test-font.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/NEWS b/NEWS index b189f2c71..6612be6aa 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,8 @@ - Support instancing axes not referenced by retained `VARC` data. +- Fix stale face data and possible use-after-free in hb_font_set_face(). + Changing the face now releases the font functions and their data and + installs the default font functions for the new face. Other font + properties are preserved. Overview of changes leading to 14.6.0 diff --git a/src/hb-font.cc b/src/hb-font.cc index 0430f1253..0f54eeb02 100644 --- a/src/hb-font.cc +++ b/src/hb-font.cc @@ -2476,6 +2476,11 @@ hb_font_get_parent (hb_font_t *font) * * Sets @face as the font-face value of @font. * + * Font functions and their data may hold pointers into the old face, + * so the font functions of @font are released and replaced with the + * default ones for @face, as hb_font_create() would set up. Other + * font properties, such as scale and variations, are kept. + * * Since: 1.4.3 **/ void @@ -2497,6 +2502,10 @@ hb_font_set_face (hb_font_t *font, font->face = hb_face_reference (face); font->changed (); + /* Release the old font funcs while the old face is still alive. */ + hb_font_set_funcs (font, nullptr, nullptr, nullptr); + hb_font_set_funcs_using (font, nullptr); + hb_face_destroy (old); font->changed (); diff --git a/test/api/test-font.c b/test/api/test-font.c index 9f2a5cb84..747889118 100644 --- a/test/api/test-font.c +++ b/test/api/test-font.c @@ -716,6 +716,85 @@ test_synthetic_glyph_extents_overflow (void) hb_font_funcs_destroy (ffuncs); } +static void +test_font_set_face (void) +{ + hb_face_t *face1 = hb_test_open_font_file ("fonts/Roboto-Regular.abc.ttf"); + hb_face_t *face2 = hb_test_open_font_file ("fonts/OpenSans-Regular.ttf"); + hb_font_t *font = hb_font_create (face1); + hb_codepoint_t glyph1, glyph2, glyph; + char name[32]; + + g_assert_true (hb_font_get_nominal_glyph (font, 'a', &glyph1)); + g_assert_true (hb_font_get_glyph_h_advance (font, glyph1)); + + /* The font holds the last reference to face1, so setting a new face + * frees it; the font funcs must use the new face from then on. */ + hb_face_destroy (face1); + hb_font_set_face (font, face2); + + g_assert_true (hb_font_get_nominal_glyph (font, 'a', &glyph)); + hb_font_t *font2 = hb_font_create (face2); + g_assert_true (hb_font_get_nominal_glyph (font2, 'a', &glyph2)); + g_assert_cmpuint (glyph, ==, glyph2); + g_assert_cmpint (hb_font_get_glyph_h_advance (font, glyph), ==, + hb_font_get_glyph_h_advance (font2, glyph2)); + g_assert_true (hb_font_get_glyph_name (font, glyph, name, sizeof (name))); + g_assert_cmpstr (name, ==, "a"); + + hb_font_destroy (font2); + hb_font_destroy (font); + hb_face_destroy (face2); +} + +static hb_bool_t +_set_face_nominal_glyph_func (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t unicode HB_UNUSED, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 1234; + return TRUE; +} + +static void +_set_face_destroy (void *data) +{ + /* Font data may point into the old face without holding a reference; + * the face must still be alive when the data is released. */ + hb_face_t *face = (hb_face_t *) data; + g_assert_cmpuint (hb_face_get_glyph_count (face), >, 0); +} + +static void +test_font_set_face_custom_funcs (void) +{ + hb_face_t *face1 = hb_test_open_font_file ("fonts/Roboto-Regular.abc.ttf"); + hb_face_t *face2 = hb_test_open_font_file ("fonts/OpenSans-Regular.ttf"); + hb_font_t *font = hb_font_create (face1); + hb_font_funcs_t *ffuncs = hb_font_funcs_create (); + hb_codepoint_t glyph; + + hb_font_funcs_set_nominal_glyph_func (ffuncs, _set_face_nominal_glyph_func, NULL, NULL); + hb_font_set_funcs (font, ffuncs, face1, _set_face_destroy); + hb_font_funcs_destroy (ffuncs); + + g_assert_true (hb_font_get_nominal_glyph (font, 'a', &glyph)); + g_assert_cmpuint (glyph, ==, 1234); + + /* Custom font funcs belong to the old face; setting a new face + * releases them and installs the default ones for the new face. */ + hb_face_destroy (face1); + hb_font_set_face (font, face2); + + g_assert_true (hb_font_get_nominal_glyph (font, 'a', &glyph)); + g_assert_cmpuint (glyph, !=, 1234); + + hb_font_destroy (font); + hb_face_destroy (face2); +} + #ifdef HAVE_FONTATIONS typedef struct { hb_font_t *font; @@ -1125,6 +1204,8 @@ main (int argc, char **argv) hb_test_add (test_font_empty); hb_test_add (test_font_properties); hb_test_add (test_synthetic_glyph_extents_overflow); + hb_test_add (test_font_set_face); + hb_test_add (test_font_set_face_custom_funcs); #ifdef HAVE_FONTATIONS hb_test_add (test_fontations_glyph_from_name_threads); hb_test_add (test_fontations_scale_changes);