From 0bfc7a9b1695ed6cb01a4ff28bc10d8904b2b4fd Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 18 Oct 2026 19:54:45 -0600 Subject: [PATCH] [glyf] Charge composite offsets to the work budget (#6410) * [glyf] Charge composite offsets to the work budget Composite glyphs prepare component offsets before descending into children. This work was not charged to the shared rendering budget, including offsets for children later skipped by cycle detection. Repeated preparation through COLR extents could time out the shaper. Charge each offset before loading it and restore the scratch length on failure. Add a cyclic-composite budget regression and the minimized fuzzer testcase. The full Meson suite passes (292 passed, one skipped). The reproducer completes under ASan/UBSan in 17 seconds instead of timing out after 60 seconds. A failing-allocation variant passes 100 runs. Fixes: https://oss-fuzz.com/testcase-detail/6193853460447232 Assisted-by: OpenAI Codex * [glyf] Charge component preparation as traversal work Component preparation parses records and updates scratch vectors, but charging one unit per record still allows excessive work within the shared budget. Use the existing 16-unit glyph traversal charge for preparing a component, including children skipped by cycle detection. Increase the cyclic-composite regression's budget so it also catches the undercharged preparation path. The reproducer now takes about 1.1 seconds under ASan/UBSan and 0.03 seconds in the normal build. Tested with the full Meson suite (292 passed, one skipped), 100 sanitizer reproducer runs, and 100 failing-allocation variant runs. Assisted-by: OpenAI Codex --- src/OT/glyf/Glyph.hh | 11 ++++- test/api/test-draw.c | 44 ++++++++++++++++++ ...minimized-hb-shape-fuzzer-6193853460447232 | Bin 0 -> 463542 bytes 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-6193853460447232 diff --git a/src/OT/glyf/Glyph.hh b/src/OT/glyf/Glyph.hh index 04ac4c4ca..b203c930c 100644 --- a/src/OT/glyf/Glyph.hh +++ b/src/OT/glyf/Glyph.hh @@ -374,7 +374,16 @@ struct Glyph case COMPOSITE: { for (auto &item : get_composite_iterator ()) - if (unlikely (!item.get_points (points, extended))) return false; + { + /* Preparing a component is a traversal step, even if cycle + * detection later skips its child glyph. */ + if (unlikely (!hb_budget_spend (*budget, HB_BUDGET_16) || + !item.get_points (points, extended))) + { + points.resize (old_length); + return false; + } + } break; } case EMPTY: diff --git a/test/api/test-draw.c b/test/api/test-draw.c index a52ccb941..25df3b8af 100644 --- a/test/api/test-draw.c +++ b/test/api/test-draw.c @@ -1150,6 +1150,49 @@ test_hb_draw_cff_budget (void) g_assert_cmpint (cff2_blend, >, 512); } +static void +test_hb_draw_glyf_composite_budget (void) +{ + /* A child composite whose 256 components all reference itself. Preparing + * its offsets must consume budget even when cycle detection skips children. */ + char glyf_data[16 + 10 + 256 * 6] = {0}; + glyf_data[0] = glyf_data[1] = (char) 0xFF; + glyf_data[11] = 0x02; + glyf_data[13] = 0x01; + glyf_data[16] = glyf_data[17] = (char) 0xFF; + for (unsigned i = 0; i < 256; i++) + { + glyf_data[26 + i * 6 + 1] = i < 255 ? 0x22 : 0x02; + glyf_data[26 + i * 6 + 3] = 0x01; + } + const char loca_data[] = {0, 0, 0, 8, 0x03, 0x0D}; + + hb_face_t *face = hb_face_builder_create (); + HB_FACE_ADD_TABLE (face, "glyf", glyf_data); + HB_FACE_ADD_TABLE (face, "loca", loca_data); + hb_face_set_glyph_count (face, 2); + hb_font_t *font = hb_font_create (face); + + draw_budget_data_t data = {HB_BUDGET_DEFAULT, 0}; + hb_draw_funcs_t *draw_funcs = hb_draw_funcs_create (); + hb_draw_funcs_set_set_budget_func (draw_funcs, draw_set_budget, NULL, NULL); + hb_draw_funcs_set_get_budget_remaining_func (draw_funcs, draw_get_budget_remaining, NULL, NULL); + + g_assert_true (hb_draw_set_budget (draw_funcs, &data, 10000)); + g_assert_true (hb_font_draw_glyph_or_fail (font, 0, draw_funcs, &data)); + + g_assert_true (hb_draw_set_budget (draw_funcs, &data, 2048)); + g_assert_false (hb_font_draw_glyph_or_fail (font, 0, draw_funcs, &data)); + g_assert_cmpint (data.live, <, 0); + + g_assert_true (hb_draw_set_budget (draw_funcs, &data, 10000)); + g_assert_true (hb_font_draw_glyph_or_fail (font, 0, draw_funcs, &data)); + + hb_draw_funcs_destroy (draw_funcs); + hb_font_destroy (font); + hb_face_destroy (face); +} + static void test_hb_draw_budget (void) { @@ -1318,6 +1361,7 @@ main (int argc, char **argv) hb_test_add (test_hb_draw_immutable); hb_test_add (test_hb_draw_budget); hb_test_add (test_hb_draw_cff_budget); + hb_test_add (test_hb_draw_glyf_composite_budget); const char **font_funcs = hb_font_list_funcs (); for (const char **font_funcs_name = font_funcs; *font_funcs_name; font_funcs_name++) diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-6193853460447232 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-6193853460447232 new file mode 100644 index 0000000000000000000000000000000000000000..5b9e5c7d8f0a2f56a691d841d3fd40438a80477a GIT binary patch literal 463542 zcmeI*2VhNS|G@F*-VBlm2|}6}v1*10L9N7$2$f}oR9wl;AWL!+v14yy6;UN-ji6$e zl+>!ALK~?VwJNHpm?hl*b8=~UOWU{qzN2ry4|hH1IqP%pd4A_S=bR@(C4?xenqZY@ z@}OO}Er+r(mf6zsKC>|OyB;<>Z2RF<2IxG1U5gnuv zn?xTWQ~@6eVIHYTj1d9q4f1o69PALKiPR3y+ciN5GdaGoTTFDEPCr33lEatZm%|gn zw3-qbINv~r#Dg^e7NVkDQ(C|?At zTRpW*(0p+2ELp+5Pu_T8yZs86U*s86U* z4Ev_aGsp8B&%ddyi+D-ABwi9PiI>F77h8dRrTv@sZ_e*?i5kLR| z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1pdAPh8}l}3@`ezqLI=GkKT}q8*+uU zv57dFlaoDblTH}77O4*IUhCHDZwU`M-0hiV#rE#L-CMOiwJ`aZlA#uIYPL^|ihA=g zmpT3H0(?tWjr^Lo16Pk zK5}z=sf4i*4caERk>e|=q!9kUo_=pR|NBBXB!p=-B{Isl62diK*o*23k-9{)QX)lm zTNE}ZK3b=Z3y%to=&y;>%H_%zHgZUc(R3k<@$vGjxRaB zd_%PK_a|NwFNv3O^WgeHuGi%H*#DjDW4Tt@5ZXBwqHgC}eC~bV-UseAapT%6uD#-1 zGUt-zt|4vXw2jj?PTM$byFiMv{! zvw6Swl&!n3ex_ctOW*TZo4CCmx08-kt8sF^&(tyJrX=qPDnF^GDs-wQa?}qaQ*Jm; z$U4(>u=(00s?>Xp;unTloO*w806{ly@^r%J9!_6?a3>sVewG4tM0LVUr*iI0qdqU;DqFj$mx1d1Ruy3+XE?XRsef!(v1&<3Wf3cvepWU$` zr7CTC-1n4qlfp}*bisFP+_Cf6Io#~?790F)UTr;l?a~dpgYn-sICed=taq0Y`q7^R zFFf^q!T7-wi#2uoA-3JNb=A5RB(A8jDF4PtyCB`2)ZVHZSIovnrmQS~_sPc-7Z>~1 z*TW*G(bkm(lQJT!by<-2^n1t7J!UvWjCwL9v4wM!$gUmjCOmCwTgt{yv#tHUi&>ZM zk6&QE_pUfS=gi6M!p>iPVR8AJ6`La;mfJluugRS9?vUi$C2;HXIk(GKJ>Gq9=G&E@U7mCx zWYE!(TBir)!_>Lm2dOO@r&pKNrzQDE228K2t^eaeJF~p$n&7v( ztM3f_teV&6ce_VbE1aK`l(~M>q&bm3TXw9-oL<-#Fxctwhh(4T@EqH^h5(f4_$}&&OPLYXV9Qjy2QK&8rA*&etCzRW_|?O=?tWsTw_ZE()|juv^qpVt`?y}sHr?-r z*Uo<1sPvAS-?hw;Aq1}>QsZ1lNidb6C_TR)sxd-AX?*X(Uo2Lmix zrdnh!ICnT*ZMnIM!`TX!L)ZCle|%_3UOivmZC#>U3`~x^mgYTDXI7B@-mK1(>sa^o ze*cGAXI4Dja%1BDEmtRWyL+M2y*7S>syon){@J-|_Q_af`Y|g=ige zT*JL)_VlV^chs}s@L64F`!fkMKj=5B-TNNpyWcRrn$hN+{AG4!J8Z4H_4vNqA8bte zd`(>6(x1A29{B#UnwHIW4Q*Ab@}dcC>%F^Rr%R}=pljBJZ2P0ZE$4mQFZaEn`&aL| z5!G&33oj z>fL#6R^wsUkKcUU$G_&Kd5=7Qn0onywcV8q)#vrS=coPh`qMiT3l==Y1vpV<=GTXEC_Qr$7J`m1}UE_A0KCCvb)}_@aH5Uecy`}5Q zE?vGnn&o|9LY9~3$VwCI6j;n1H@@5Lp$mJclR8g#IT<*%<@GAUxboC5yb?{mb*?|E z_#BV44^wL{sOE7kao~?R6YhQg?6`N6d8UqAsw~{-);Ddh&$hj1m*y?7PH;_6wQK&_ z)oTy0*KECV*wN7`tr{$xUd2CSfz#DJsRvnF21*Gdii;U$2mT3F zx>QxY=E5QK)elD-4f(Xjg$iaj{QFP#isBL)?g?PaI7b!xRa zY~RIex9<8D^SM_ z{q4qw7w(_8>~nKc_L%jLylX8g9dK&tcb|T()0Ojdh`wB9M0dL~0Y@gTua$9ep=0`~ zs-+iS4?CU`>od`Jqw&xy4>L=DJ-}g>Z3_`lYSrU;+be$P;N5n_ze=<&UEC2Q=>GCd~c&bo0c zFLZyOT@kuThrGP@I6SC+?mM%_UDt1GbEejTmL=Yqk~Vgx<|Auu(BTpOW*MmgJ8qjS z*_N>G!q*<7JDf}@95c9SmDF}wIi1`;_l}(1?A?p=9p~(fN*mj`UU;SJ83Up!O)2Nl z$1d8ec>9e$cTOG7n(TU{gQ@u_*Rcs@YiyraditWs!)4!_GiBAF3y+F7kNU_oD85!s zg{Y;CN}joI|7lt8nW>c)T&|h6>YLW@c3xdKU}M|yZXR-as1BMMM3L6 zt~RFBiUx5lC+BTGkP&rh*u5!Y0v7q)BDl zinW&?i>cJ6N~@avf)6Af8hW&5$LYO%9D?^hDm=00Y{YT9w^^KSN-$49vO*Q z_bvuM>h7nhoPEvIs-fA!vZa=9>QiEhr{|4Bv&>R%oxQlsuUhD!6_2mih>rZIV!PXQ zKFaE{H17DaNf{^dR`wh{;M!=XRds_iDv#dM|H}^fwsrkxo4TLdd)W`)IoCGQX|;E)6WWo3U27&-C0eZ;bGxGZqY&_Wfm4rF4-wDR8!`1gjw;%=9L#!vk8A-t@+#~B(KlN?2NNp z)ILs$2M3lvb^M4{ozt&)pY1)iS8c7yQ+G?QdinH%tolDjEogT>_;y6cvt!K5Px16P zHR;fg4mB#5z7jcn#M5dcTV0xQ=E9O`jiT%v?w1>xka^2dec{R5IV;R+FP*w?^MkCR zD=w=BSab^6?(@|x$J4$A2hMj&sPoo<)X3tC8|bSv+i0_JlFzNR`)-GSdh(OKmyA+I z-Dy<&kXP+%HAa^mU4GnBkJUW`YOP5->#%F7MTUooZU54TKN^{nm>%SBziq(P_mi4$ zwtTOo-gZUDNndu!`C+!3`mX8Sqs6~on-Vi)!Q6s8+~@k@`n`v>8aF~$rf!b) z`P|1%uJlMhFkr`#TB`;n59@qma<8>@ddKhG_wD$Pr&TExacp5s+D;qUpHihWO{OK6 zvl~%&Rd&Pg{pPJmyIpH~Qg**gD@~{Rwc4*pS-9u$Y?FPi=I7=uXx3s=#X-fAZ>G-Z zns>fI-)YOtCq&t*zZ{r$+rHV=57s;?W@7C7xOn&!o9JSv;#ba|k(*O(+t@8P`WG>S_~LyJzmBY0bvlT5sQWzVfoAHC(H8 znpLmh#Kut#Mqe#4pnBmu56;Z9o>_8q zTz$TG=-v+FChHv!+B6&PJ9W+awA~?#?K9IaZwt1szxz?Vy?1QQZyxP08QrO2=Zg!v zgf5#g)5X(BEYG+3?t{3I9WOmuv)g21mfwc`yF_;932m#k?wfI;-IVb^6!bcKYIyHw zv4<9a9iEkLVYYVr(cXvWzS}5je6`5~#;%Ax(Zlb|{h@be_Ear;JG0CFS(P$Qgse0Z zAGYsv>-rwYXv^pUAA6fFZ<28M>fI5R`eDXrzxni|gHc;LZ}m!R?d*|0!nx;n^HPpq z?w;n5_15e~*(cg{tG%yLlJmil!~8op-BsOcN%Fd}M_ZQ3eNwSy+pyG|^M35KVVCFf zN@-gMetvh<;pYY}#*VvDp|ER9ps@=m%wflTp z_;A(7wV=RYZ+3`Y{#xczL(Rh4>PE)!SR-<>__{jnJ( zFW$2Et?^Okj4K|WX6^_%cq(~*)6n_;4qJlHzU48l|Cn3ZIqhPqKt13cL#lvL(yNik@@?Sq%V4Y^(j0kJT@pkG9*Hq zs0>gWMlh6rwPexMt>i3>g=p8Ui_eM`)$@e#oF+v4&30aGx_o)!$s{564VP0m*{Mex zAJI~D6C%?~es0jsw}EqqrnWqbi)WoP0!pg~s-;j$72-4b*(fPAVo1oto%fCkQS6Ek zxFzKDn}o>>vw7+d<>&VDbM>%DUE-Yj<;%#=`Eq(CBBFydL5ss(C08w(w>wgk7$Yu; zO7eY}EbkDdiPUy4RsFW?vweXOWh`Q%<8(J_j`kFy;R+$%x+=^3+mrI;%E$4oUDE?g zwY)D>MsihzxHRP6^_O3bHx=a@i5Fj`9LH#z-c-_F65?42le0x%q%z8jWL?GDDBmc* z(AF?Sd9VEK=!P%ltChJc=^yfovR+gEUzRU^eL4Tod=LL}egDvO{+$kTUcdHz{i~N> zl_Y-(f71Hq8~wNXpTAXD{y*#d&wP(c*_YFA{63266TQt7VYSoUw|m=;F3v@DmWxUCoF`qnUblJc|tGr`qn}n8xz)Fm=;ws#&UpZ(R*3RJWrol%kswp zeop$LB;23pD8&x{oJ4UsUA3!;5Uw}A=~uCW9BQr-$LbgsK@%JprHPG=9$Y?duvQxr z*u*KYk&{zk%uo3?hJ2^MpnpYr=QXpEc`xUdGb})3mq4X(n-|ObJX_|;AwMr}1*P;` zFOL$djnQg!&)4$#5W`rn45@4w$GLIS`YwUa?>NinSBBdehC9l+$^Wk#B(s&FuMDz( zKGmjjF&jI*c9@dyEQh}`UeRjA1Ufcs<`n4ik0X{fOjLeT^4n5YeQOZs0|JtTqa!Ry|nxBcil@-Hj|=iR=&O*j(^JkQ^WCpWp&p-TBnPS42%sA z4bznkiU^Mhj0@8QYXf!BF@{X*mokI2Q95mGh4832tu9c>kI@DP#%hAYH4*Z+D|d2( zbfrU;&$3)#OvAvqf!e{^;L<_S5z(=-q_Qs@p^XbnaQbCdL-U}GYN2wQs_bAEl?#k@ zak4Os5*XXi>81C|R03n2mBD($ds$!oRJ4(clTBQ7M7W%vGT(^sC~cr7A|^~@7o!P} z(#gzNxxX6|78o={nNCP}Y@E*iwS(fcLD5mcwo%c~i$=yr=)#q$8YWQBuwey7herj; ztxvA9CMr}}zmVwI!J63M!2S{OayjLS%MH}&cNcyR+2EfTL8;y9|5kYgA}UaRJwue` zaW)kH#h&QD=BNMLd%%YIp8jv$Re5y<9OT}qPnO^VkYwP=bd0zZL4S}%k&p+uQh7BxER!ebmlS zL%WV4-yB<$YuM=+t(a+}rK#EZ@phbd;>B=;zbR zU;oUI^*pbVpO61P=2iCdY2WLa5&>jV$)*VJn6-|-~TFuxlD2& z`}N7~MfTV>syO)<6@Fbg)mXF_6wE#SCmvq!sd_6 zj&Tq`009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL_^SvQdfYKGyy(Y@MoK3< zdP6F1$Q9PcCgN;PPWG%#I$_*eq&m2Jty{0ZB|PMCw`Z0W+q?UAZ`JnH!sKI0hFZv} z**-BU>dnVo=Jd0ZPinEmT8P@pq{|3VTISeW^?9Vs=ULHz!yNT`H~Gd?PEVMmi*eJrULi4@swQP`mPXq`4LJSsGzza~yAmn&b`$RR04(}gg~7s2XQPc77mA}UH28x*gJ zFw9t3$yenelU(!{32(gleN&%MpHP1jFNv4Gy&proBwi9PiI>Dn;wABtcuD(-Y)hfN ziuNkn2WgL`J@$=_;D#1w;wABtc**%4&ZlwyQl7um#&Q1g4H1)g$@zJCLf`N+;P{f` zOO7u&zU27w4bjrypLj{UBwotRgX;&mUX$x%xjy!dkDn;wABtcuBk@UUGji_ZR=3`@U(9{d?Rmtk<9TSN0l-m-P2m^fTak za;_)mdUCEO=X&zj2TPe-R8Rhnb{38=IliPnEc(NuKP>vgqCc$PJ}*JMBwi9PiI>Dn z;wABtcu9X)vZaCcSlVN0kEK19_E_3u`FmAGP4E1@syA#3^zT9c9`x@){~m9s9$sW~ z{*wEZxnEgs4a7_0CGnDY`64jB;gxtvyd+){FX`Wd{yqLn`}a`p8dj2WKQVvLULx@K z>|e7p!|@KsI~?zDyz`o>;pHqPkZ?cX|Hl1*?6Liq?y)IT literal 0 HcmV?d00001