From d94c18b6a67b43007550fa4514d92a7e9380a697 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Aug 2026 12:47:41 -0600 Subject: [PATCH 1/3] [subset] Clamp variable advances to UFWORD range in plan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When instancing, the hmtx/vmtx advance is computed by adding the HVAR/VVAR delta to the base advance. The delta is attacker- controlled and unbounded, so the sum can go negative or exceed 65535. The negative case, cast to unsigned, produced advances near 4 billion in hmtx_map; CFF::optimize_widths () then looped over the full [min_w, max_w] width range, taking minutes (the oversized cumsum resize fails cleanly, so this was a pure hang, no memory unsafety). Clamp the computed advance to [0, 0xFFFF], matching the UFWORD range that hmtx/vmtx serialization stores and the hb_max (0.f, …) clamp already used by the runtime metrics path. Fixes a ClusterFuzz timeout in hb-subset-fuzzer (testcase 4846730722738176, minimized from timeout-fd8f4bd2a650). The testcase went from >60s to 5ms; added as a fuzz seed. Full meson test suite passes. Co-Authored-By: Claude Sonnet 5 --- src/hb-subset-plan-var.cc | 5 +++++ ...e-minimized-hb-subset-fuzzer-4846730722738176 | Bin 0 -> 4781 bytes 2 files changed, 5 insertions(+) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4846730722738176 diff --git a/src/hb-subset-plan-var.cc b/src/hb-subset-plan-var.cc index ea28fcc0d..c8068f72b 100644 --- a/src/hb-subset-plan-var.cc +++ b/src/hb-subset-plan-var.cc @@ -587,6 +587,10 @@ update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan) if (_hmtx.var_table.get_length ()) hori_aw += (int) roundf (_hmtx.var_table->get_advance_delta_unscaled (old_gid, font->coords, font->num_coords, hvar_store_cache)); + /* Malicious deltas can take the advance out of the UFWORD range that + * hmtx serialization stores. Clamp, to keep downstream consumers + * (e.g. CFF width optimizer) bounded and consistent with hmtx. */ + hori_aw = hb_clamp (hori_aw, 0, 0xFFFF); int lsb = extents.x_bearing; if (!has_bounds_info) { @@ -602,6 +606,7 @@ update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan) if (_vmtx.var_table.get_length ()) vert_aw += (int) roundf (_vmtx.var_table->get_advance_delta_unscaled (old_gid, font->coords, font->num_coords, vvar_store_cache)); + vert_aw = hb_clamp (vert_aw, 0, 0xFFFF); hb_position_t vorg_x = 0; hb_position_t vorg_y = 0; int tsb = 0; diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4846730722738176 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-4846730722738176 new file mode 100644 index 0000000000000000000000000000000000000000..b5d0a14da1afb2482f689c09c4a4d728388fb95b GIT binary patch literal 4781 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 NH3f=)nsPU%{TCmFExP~! literal 0 HcmV?d00001 From c2b6b09ed20f395b8d8855e47e350565174f40f2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Aug 2026 12:55:45 -0600 Subject: [PATCH 2/3] [raster] Fix signed overflow computing row bottom at coordinate limit edge_sweep_row () computed y_bot = y_top + ONE_PIXEL in int32. The scanline loop clamps y_top itself to INT32_MAX, but when the surface sits at the extreme of the 24.8 fixed-point coordinate space y_top can be within ONE_PIXEL of INT32_MAX (0x7FFFFF00), and the addition overflows: UBSan "2147483392 + 256 cannot be represented in type 'int'". Saturate the addition at INT32_MAX using the same 64-bit-then-clamp idiom already used for y_top and the x interpolation. Edges are int32-clamped too, so no coverage exists beyond INT32_MAX and the clipped bottom band loses nothing real. Fixes ClusterFuzz issue 541858526 (testcase 5513551012495360). Reproduced with a -Db_sanitize=undefined build: one UBSan report before, clean after. Testcase added as a fuzz seed. Full meson test suite passes. Co-Authored-By: Claude Sonnet 5 --- src/hb-raster-draw.cc | 5 ++++- ...-minimized-hb-raster-fuzzer-5513551012495360 | Bin 0 -> 51063 bytes 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5513551012495360 diff --git a/src/hb-raster-draw.cc b/src/hb-raster-draw.cc index ece9e068d..81401b179 100644 --- a/src/hb-raster-draw.cc +++ b/src/hb-raster-draw.cc @@ -1057,7 +1057,10 @@ edge_sweep_row (int32_t *area, unsigned &x_min, unsigned &x_max) { - int32_t y_bot = y_top + HB_RASTER_ONE_PIXEL; + /* Saturate: y_top can be within ONE_PIXEL of INT32_MAX when the surface + * sits at the extreme of the fixed-point coordinate space. Edges are + * int32-clamped too, so no coverage exists beyond INT32_MAX anyway. */ + int32_t y_bot = (int32_t) hb_min ((int64_t) y_top + HB_RASTER_ONE_PIXEL, (int64_t) INT32_MAX); int32_t ey0 = hb_max (edge.yL, y_top); int32_t ey1 = hb_min (edge.yH, y_bot); diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5513551012495360 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-raster-fuzzer-5513551012495360 new file mode 100644 index 0000000000000000000000000000000000000000..62f6138ee117fc2f6db46c1a35b8aa5a06c7d44d GIT binary patch literal 51063 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 G2L2C$Pb_8t literal 0 HcmV?d00001 From bbfe29975d3a01d183574cd92a3f81306deabe04 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Aug 2026 13:14:53 -0600 Subject: [PATCH 3/3] [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 zcmeHPdwf;Jwf<)Bv-f!<;gFE%--kZguIU4-e3Rdp8V!p zGi$Gzz0T}4d)7R%Apo={xPW2fuDp8V#vX@&F~0!j9v?P7@5;X%`1{?!o}W_c?NQg} zU5$$|4%j=M`TpZ3_Rk*i*x0FnpbVx?ye99OvZB4aczqFhmDA@GmTB{5wPod}m>)D_ zUSav=;V)(aFEOt#nmK#HjMLAbdL3{d1=>D4lh-@vj7|XlTuI(nvqFVM8N2$eVcA61 zKX?`y-UqZtm>~jVFi@%1@SugPMf>WQx zQr9-c*P%%+1Iy?;!zO>{$3ShO@u8~8x@O^%it`aV%XVgnl(eo&bm{*smcyuHG?$Xa zt%`ul7_caf9DS!OL#&ZBCIooHNmgEJ&RD~^i*YOCen!bFIwwk=6P-3_$_CE0mvi%W zIdMuqCZn>s#&|{SHL@&&*ejNc8$~89ct0MrEcX8eb=E3lXQJ%&lKMyov0Jq#)vO*G z4g-u*LcW3Ox^*i2Wcr1y!vjD2qhA}Tr2J(0b=i-vfuF>0c$oeV`1yM9n^Jx{{BEY* zQf4OnyzKW#{v7zdOnWJao8hNAeqSf1=flreqCbI!uo8YM;!l*iJ`8^n!qs1e8776R zPlg$5nZ7PuUCng$8K(2Y)n78r7!F?*u0Fx^2`Mu+Tz#DB+-tN zTrQj0yZgFx-6Px++*91e?z!&8?t9&<-J9Io-Mihdx(~WP zai4V8dVHRCp6;Iho(Y}`&sxt*p3l7OJW_>+|~3eCfWvzFgl3-vr+jU$JklZ?W%Q-)i3`-*(?_-z&a%eMfx9ePRzJo*Mmx*;Ha%IUziUr^4QjL#+6mCWM9$E(foa{-y61Gy5r?vm z9LYYSB}qJzEe(GcYD9+C6|_!~+&#ygGel(c9CMS_wf4~Iu01o@U$){K5z^9;1X`^~ zHM@7~m6J1Q@WAZ0Y3C2>)xDdUmX_LfVD{h~5z4xtPj+^nKG{7xck0x+OUF)~#k`TZ zxg-0I95Q62nbo^@R_=hz%mKXXe!evVy6TNXgxD`KMP`lWIs2_W{Mo+4(aYi9iweCnteCe~2@^=;S4!3j6WXlXmPERh<12x(UXNUjOudoM2p8)R@ zeF6^OvP7pH;%JASbc=VO7x6WmPdtJQ;%W5eD3pXg#O}C&n2Su}IP@ik(2uwf{fR3u zfcQ4Dh{yOMho=?;0dFb?K6v{ehZw|Q;d#Cg&z@%FoyUO zTuEGxvBb@|iui(@b|kzFPCOEhVFIxhS94TO#YAEs4z@`AG4hE^aV>E*t|M**-QL7M zVlwfs9E6d09M=O$ZVq8cO2-u9MYxfej{;&TrV^K-khl-ih+z)bXmuf96KHiMLd0p9 zL7dN_8?ElcEZS{@(CTlP&8xK>(&2B55@H@oiL+5ge2Bw4{CiPOJctV7|9}%7e=X*6 zE|!9M#9p|Ccp(RWv@XH|;!XGou?!1|^S}vN>!0FQ;u73Oyc<6w-iJlRl~_z%gC)cb zSW4WC+lf!(4&t-8lei0a5nsgJ#C=#sd=)<@9>6`sgZKsULk{w2{W0z%9>Xt*C$OA& z3M+^;_!W>0+)p&=m>@Y34-mUa$1Qm%9wJ_aRm38!Cf-Ab0m;u|Epa!U7bNe;I^sb* zLOhD~#ILXcNC7qz+tR&2N(Vei9FFb8AK_Wzcsxg(NY?`?*V17@$_>~_T!!BfcXFUY z$|rc96TH^=J@FF!LCL(JWOgf=7nRH(l}weA*+aYudx;O>CE`BpBc8;|K*koP`bCK?6VDor1=J=;YWlL8mTF8uFy6wgeFdDld4#l!L8~i7hg#3 zyZL>#)Z-qsWDnPut&-fssH)F>N^%e29NCqYEZZ~oZnsHpd-)!W<<64aZL;lSxmR2D zZmZ9|SaJinp}d}KFUh^3JWyY@wd5|s&%$IUu*F)l`k)j+$1Sq`7_^@GvOO7G1Neef zDKpYI|L#quIZZ~xsOu|nSebB|?E5wuyIys)V+PcVja6ttf{bvDcRD7=f!KE$JEqfQ z-@9YR+hhUSn+y7hHqZ|RIMj+$;uP)BZ}ShfgZ@&K+s5WrB}3mTr5PfUPp3g&U5~Sd zb>1bV)a0d&$PKm$bGYBi_MM5zSad| zm**(!bsK0}8t-?4hui!VHCd z6lN;yr*MG6Y=wgq4pu6!bjkKo3t}z+Qk)92 z96kM@awr6KW;^?z_YR|;Br;Pw#W}Utfn%oP!>$fms1ALjy$RoR@6|KwiCZF z9mM#B<(r(nN~u9*B)$^(5JJ@d#55 zip42R!DyXU5h_4VgVv~1!_u}zVM~oTg)KFrw~ke*{zIu#BTivUjW~rZHKGq9wi%mJ zBTivUji!a&t$?S%pzb4czps~jwO;PMdbx70kzF`M2Uc`6>;{-+y-`Y&Zaz=V0 z8g;J|5a)i1?jaZz>i6q#$7116FVZp%T8v|l?O#Ubt09=M3~ybhKF z#Z^IE;Nv}@lk4dObYTf!0NPqHmV6VMhJ+w2rWmWOjW81BQtOlGW-XxztTwPr!CQe(p(n)f?O!2 zQSumsosmKjvB(yz6qD{3cO!47*l<-Xj~eZi`dhQR%jl|_@NE*p(rOB zF=sCRQx<)xJrDJU&3o>^QHkK}Z|+Ct@x-8p*0sD8Z~xpSRV zG}WhBv3eTDC2FbI*pI1KS5(c$Dy=UWRkdFus@4~+my27xMU^dqcvQ9}<5AfbjaTLR z;#N+MgVvzkjj0T}X>vUd?Kt#zr1RhL484Iac!FGyT)O6xpujV9Dz-w$(;V=(&`EfT zPLUx!P!8cN@A@t147pyF9M_l9?K4v4@l7LFIy=TV>G~KU=?EDMrE6oXkdBSx9ydzx~<1^{37-8wAm}$~UF)xtriaA?4E9MgEu9&N&!(u)o-5GPAbXv?0qitnwu6R$mpEs zQH}1L=TXh@gO77^{V-lD3vfE(oaf=ROXD)MbDl>UgK*CCIOlofwt{n>Cur>kI_G)R zp(lCx$2rf#bve}{iyj*i4BOjj^kr&WY?TJ<-q z**aEaDbS*@rAC~>mKxDp$Ewtn8gU9+YQ!mQsS#~ksu69*rqqa2*ixfuVdp%LeNIRo zM6k{cai7{b&*PluVJCFX^H^tlobx<9&m%v^u?P&DNU1X}94Hla&hv1P;pi`9<1`Gy zIx7?1dM>axA+24-X7+CFO~}Yzcr$yqwxqKW>THBMA2zUhpz~n^=feihhYhx{Gt~VH zxAS2Gx$N$I*udEcjqMfAMyRt9TKA6p*Pc*_cUR9^6m#BXoOs3CWC3R*w3{*;XCoAu zmN7URq0Wa5)IY>K8==ldXzXsDvk@BG8qP*&0bdgQ(w&`-4uCnO{n?7OFZ8qIy(<+3V5^28x literal 0 HcmV?d00001