From bbfe29975d3a01d183574cd92a3f81306deabe04 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Aug 2026 13:14:53 -0600 Subject: [PATCH] [raster] Cap font-derived surface dimensions at 4096 pixels per side When no extents are set explicitly, the paint and draw contexts derive the surface size from font data: glyph extents (which the auto path in hb_raster_paint_glyph_impl () feeds through set_glyph_extents ()) or the accumulated outline bounds in hb_raster_draw_render (). A malicious font with a tiny upem and huge glyph coordinates turns that into arbitrarily large allocations: a 49 KB fuzz font produced several ~885 MB BGRA surfaces live at once (root surface plus one per PaintComposite push_group), nearly 4 GB total. Add HB_RASTER_MAX_AUTO_DIMENSION (4096) to hb-limits.hh and clamp width/height at the three font-derived sizing points: both set_glyph_extents () implementations and draw render's auto-size-from-edges path. Since push_group and clip surfaces inherit fixed_extents, the cap bounds those too. Extents set explicitly via hb_raster_{draw,paint}_set_extents () are not limited. Fixes an hb-raster-fuzzer out-of-memory finding (testcase 6344015149858816): peak RSS 3.47 GB before, 350 MB after. Testcase added as a fuzz seed. Full meson test suite passes. Co-Authored-By: Claude Sonnet 5 --- src/hb-limits.hh | 8 ++++++++ src/hb-raster-draw.cc | 10 ++++++---- src/hb-raster-paint.cc | 6 ++++-- ...-minimized-hb-raster-fuzzer-6344015149858816 | Bin 0 -> 26560 bytes 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6344015149858816 diff --git a/src/hb-limits.hh b/src/hb-limits.hh index 49073d3a8..97d01128a 100644 --- a/src/hb-limits.hh +++ b/src/hb-limits.hh @@ -128,6 +128,14 @@ #define HB_RASTER_MAX_BUFFER_SIZE ((size_t) 1 << 30) #endif +/* Maximum surface dimension (pixels per side) when extents are derived + * from font data (glyph extents or accumulated outline bounds). Bounds + * attacker-controlled allocations; extents set explicitly through + * hb_raster_{draw,paint}_set_extents() are not limited. */ +#ifndef HB_RASTER_MAX_AUTO_DIMENSION +#define HB_RASTER_MAX_AUTO_DIMENSION 4096 +#endif + #ifndef HB_REPACKER_MAX_ITERATIONS #define HB_REPACKER_MAX_ITERATIONS 500 diff --git a/src/hb-raster-draw.cc b/src/hb-raster-draw.cc index 81401b179..763a85b85 100644 --- a/src/hb-raster-draw.cc +++ b/src/hb-raster-draw.cc @@ -346,6 +346,8 @@ hb_raster_draw_get_extents (const hb_raster_draw_t *draw, * This is equivalent to computing a transformed bounding box in pixel * space and calling hb_raster_draw_set_extents(). * + * The resulting dimensions are capped at 4096 pixels per side. + * * Return value: `true` if transformed extents are non-empty and set; * `false` otherwise. * @@ -396,8 +398,8 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw, draw->fixed_extents = { ex0, ey0, - (unsigned) ((int64_t) ex1 - ex0), - (unsigned) ((int64_t) ey1 - ey0), + (unsigned) hb_min ((int64_t) ex1 - ex0, (int64_t) HB_RASTER_MAX_AUTO_DIMENSION), + (unsigned) hb_min ((int64_t) ey1 - ey0, (int64_t) HB_RASTER_MAX_AUTO_DIMENSION), 0 }; draw->has_extents = true; @@ -1302,8 +1304,8 @@ hb_raster_draw_render (hb_raster_draw_t *draw) ext.x_origin = x0; ext.y_origin = y0; - ext.width = (unsigned) hb_max (0, x1 - x0); - ext.height = (unsigned) hb_max (0, y1 - y0); + ext.width = (unsigned) hb_min (hb_max (0, x1 - x0), HB_RASTER_MAX_AUTO_DIMENSION); + ext.height = (unsigned) hb_min (hb_max (0, y1 - y0), HB_RASTER_MAX_AUTO_DIMENSION); ext.stride = 0; /* filled below */ } } diff --git a/src/hb-raster-paint.cc b/src/hb-raster-paint.cc index edee5fd3a..360ae29a8 100644 --- a/src/hb-raster-paint.cc +++ b/src/hb-raster-paint.cc @@ -2045,6 +2045,8 @@ hb_raster_paint_get_extents (const hb_raster_paint_t *paint, * This is equivalent to computing a transformed bounding box in pixel * space and calling hb_raster_paint_set_extents(). * + * The resulting dimensions are capped at 4096 pixels per side. + * * Return value: `true` if transformed extents are non-empty and set; * `false` otherwise. * @@ -2099,8 +2101,8 @@ hb_raster_paint_set_glyph_extents (hb_raster_paint_t *paint, paint->fixed_extents = { ex0, ey0, - (unsigned) ((int64_t) ex1 - ex0), - (unsigned) ((int64_t) ey1 - ey0), + (unsigned) hb_min ((int64_t) ex1 - ex0, (int64_t) HB_RASTER_MAX_AUTO_DIMENSION), + (unsigned) hb_min ((int64_t) ey1 - ey0, (int64_t) HB_RASTER_MAX_AUTO_DIMENSION), 0 }; paint->has_extents = true; diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6344015149858816 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-6344015149858816 new file mode 100644 index 0000000000000000000000000000000000000000..85daa6cffe32cde891abbb4453eae41da8c1a004 GIT binary patch literal 26560 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 literal 0 HcmV?d00001