From f560bbb9e4e3549d25b340c19ceda3a561497e89 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 26 Feb 2026 00:22:10 -0300 Subject: [PATCH] [raster] Guard SVG cycles with hb_decycler_t --- src/hb-raster-svg-context.hh | 3 +++ src/hb-raster-svg-render.cc | 3 ++- src/hb-raster-svg-use.cc | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/hb-raster-svg-context.hh b/src/hb-raster-svg-context.hh index b71e73c4c..bf68fe9f1 100644 --- a/src/hb-raster-svg-context.hh +++ b/src/hb-raster-svg-context.hh @@ -30,6 +30,7 @@ #include "hb.hh" #include "OT/Color/svg/svg.hh" +#include "hb-decycler.hh" #include "hb-raster-paint.hh" #include "hb-raster-svg-base.hh" #include "hb-raster-svg-defs.hh" @@ -52,6 +53,7 @@ struct hb_svg_use_context_t unsigned doc_len; const OT::SVG::accelerator_t *svg_accel; const OT::SVG::svg_doc_cache_t *doc_cache; + hb_decycler_t *use_decycler; }; struct hb_svg_render_context_t @@ -68,6 +70,7 @@ struct hb_svg_render_context_t unsigned doc_len; const OT::SVG::accelerator_t *svg_accel = nullptr; const OT::SVG::svg_doc_cache_t *doc_cache = nullptr; + hb_decycler_t use_decycler; void push_transform (float xx, float yx, float xy, float yy, float dx, float dy) { diff --git a/src/hb-raster-svg-render.cc b/src/hb-raster-svg-render.cc index dbebe7ea5..97884aa85 100644 --- a/src/hb-raster-svg-render.cc +++ b/src/hb-raster-svg-render.cc @@ -445,7 +445,8 @@ svg_render_element (hb_svg_render_context_t *ctx, { hb_svg_use_context_t use_ctx = {ctx->paint, ctx->pfuncs, ctx->doc_start, ctx->doc_len, - ctx->svg_accel, ctx->doc_cache}; + ctx->svg_accel, ctx->doc_cache, + &ctx->use_decycler}; hb_raster_svg_render_use_element (&use_ctx, parser, &state, transform_str, svg_render_use_callback, ctx); } diff --git a/src/hb-raster-svg-use.cc b/src/hb-raster-svg-use.cc index a3003e745..688e6dbaa 100644 --- a/src/hb-raster-svg-use.cc +++ b/src/hb-raster-svg-use.cc @@ -171,6 +171,10 @@ hb_raster_svg_render_use_element (const hb_svg_use_context_t *ctx, if (found) { + hb_decycler_node_t node (*ctx->use_decycler); + if (unlikely (!node.visit ((uintptr_t) found))) + return; + unsigned remaining = ctx->doc_start + ctx->doc_len - found; hb_svg_xml_parser_t ref_parser (found, remaining); hb_svg_token_type_t tok = ref_parser.next ();