From 19e4bf2597c8407884cb8d5cea7c0f1145641ecb Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Apr 2026 17:03:58 -0600 Subject: [PATCH] [raster] Validate non-rect clip masks before reuse The raster paint clip code indexed non-rect clip alpha rows directly, assuming the clip metadata always matched a full stride*height backing buffer. Fuzzing showed that reused clip objects can reach those reads with stale scalar state, which turns the row access in push_clip_rectangle() into a heap-buffer-overflow. Reset cached clip geometry on acquire, add a validity check for non-rect alpha masks, and refuse to build new clip intersections from an invalid mask. The fallback is an empty clip, which keeps the paint path safe without affecting well-formed clips. Testing: - meson test -C build --suite fuzzing --print-errorlogs - meson test -C build Co-authored-by: OpenAI Codex --- src/hb-raster-paint.cc | 11 ++++++++++ src/hb-raster-paint.hh | 20 +++++++++++++++++- ...inimized-hb-raster-fuzzer-4872362293264384 | Bin 0 -> 26674 bytes 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4872362293264384 diff --git a/src/hb-raster-paint.cc b/src/hb-raster-paint.cc index 6e184f8d3..e6d7969d2 100644 --- a/src/hb-raster-paint.cc +++ b/src/hb-raster-paint.cc @@ -227,6 +227,12 @@ hb_raster_paint_push_clip_from_emitter (hb_raster_paint_t *c, hb_raster_extents_t mask_ext; hb_raster_image_get_extents (mask_img, &mask_ext); const hb_raster_clip_t &old_clip = c->current_clip (); + if (unlikely (!old_clip.has_valid_alpha_mask ())) + { + hb_raster_draw_recycle_image (rdr, mask_img); + hb_raster_paint_push_empty_clip (c, w, h); + return; + } /* Convert mask extents from surface coordinates to clip-buffer coordinates. */ int mask_x0 = mask_ext.x_origin - surf->extents.x_origin; @@ -420,6 +426,11 @@ hb_raster_paint_push_clip_rectangle (hb_paint_funcs_t *pfuncs HB_UNUSED, py1 = hb_min (py1, (int) h); const hb_raster_clip_t &old_clip = c->current_clip (); + if (unlikely (!old_clip.has_valid_alpha_mask ())) + { + hb_raster_paint_push_empty_clip (c, w, h); + return; + } hb_raster_clip_t new_clip = c->acquire_clip (w, h); diff --git a/src/hb-raster-paint.hh b/src/hb-raster-paint.hh index 1d6bb18a4..32c0374c1 100644 --- a/src/hb-raster-paint.hh +++ b/src/hb-raster-paint.hh @@ -79,7 +79,22 @@ struct hb_raster_clip_t return ((int) x >= rect_x0 && (int) x < rect_x1 && (int) y >= rect_y0 && (int) y < rect_y1) ? 255 : 0; if (x >= width || y >= height) return 0; - return alpha[y * stride + x]; + if (stride < width) return 0; + if (height && stride > (size_t) -1 / height) return 0; + size_t idx = (size_t) y * stride + x; + if (!alpha.arrayZ || idx >= alpha.length) return 0; + return alpha[idx]; + } + + bool has_valid_alpha_mask () const + { + if (is_rect) + return true; + if (!alpha.arrayZ || stride < width) + return false; + if (height && stride > (size_t) -1 / height) + return false; + return (size_t) stride * height <= alpha.length; } }; @@ -153,6 +168,9 @@ struct hb_raster_paint_t clip.height = h; clip.stride = (w + 3u) & ~3u; clip.is_rect = false; + clip.rect_x0 = clip.rect_y0 = 0; + clip.rect_x1 = clip.rect_y1 = 0; + clip.min_x = clip.min_y = clip.max_x = clip.max_y = 0; return clip; } diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4872362293264384 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-4872362293264384 new file mode 100644 index 0000000000000000000000000000000000000000..da19dd1732181dd867b7297632534857b7382a01 GIT binary patch literal 26674 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 literal 0 HcmV?d00001