From 2c8188bf599e351a4e0804d74612f9643b3d2443 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 22 Nov 2018 22:02:19 -0500 Subject: [PATCH] [kerx] Make sure subtables are non-zero-length Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11400 --- src/hb-aat-layout-kerx-table.hh | 1 + src/hb-aat-layout-morx-table.hh | 2 +- ...se-minimized-hb-shape-fuzzer-5722888989048832 | Bin 0 -> 3608 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5722888989048832 diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh index f075a270a..210972767 100644 --- a/src/hb-aat-layout-kerx-table.hh +++ b/src/hb-aat-layout-kerx-table.hh @@ -812,6 +812,7 @@ struct KerxSubTable { TRACE_SANITIZE (this); if (!u.header.sanitize (c) || + u.header.length <= u.header.static_size || !c->check_range (this, u.header.length)) return_trace (false); diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 430732702..bbe952fa1 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -915,7 +915,7 @@ struct ChainSubtable { TRACE_SANITIZE (this); if (!length.sanitize (c) || - length < min_size || + length <= min_size || !c->check_range (this, length)) return_trace (false); diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5722888989048832 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5722888989048832 new file mode 100644 index 0000000000000000000000000000000000000000..df1556b53ae58d6938163e6c59faa78e27c3c80b GIT binary patch literal 3608 zcmcInSx{T&6+Zv36;m)m3m8=Oii;%{0otx4FkpffAOa)=3Ucs*3Npf&#X@cno&i$c zl4hp0>%90OZJLKPGtNtOzTd^O=jAeq@L;GPMZhpG<6@)?fI`RwW&!+ zoA%87y60cc`OfyAdj$jlIEl0incN!AR5+S4cB%zf_-Sq%%s{1;e*n~0BKIg!VDbPw zj%LPaMG=&s#-W5J6fELUf&vuvs_U>klh)qQ+yJ0o!K0SN^x6t+KoWq|;+$Jt&aI_i zZQcebTLDnMx|CkbC@2oxNYthn^oCP;=urn--2T?LQISPHiK~}+`4ez4O@8UTrj^q>i zHu9Wg*>Thl)CKMI0wifSxZo5xp$&{LodiEPaPF4$v+O871~8zlOp5^nj=sTt@$Vu< zyE*8DG-NR`OtZ7Zi+9A^;`hZHC0yK*EdZ!kf#={2_&GcvK60A8KyHyc)J^kv0%IUW z^N&yt^#CS8=k-|KMxBATHu`X4))M|~!?)T_O1*KK> z`r-C>hRFR^uer*k>pk(}u8-voZv@rS+bl1ug1?tO5;OG5z*HEmM(0~X)D{T{qs<*H zi=o+kd%}O6%n$vU5O@#?b6`NBKd8yQh8)?;N-MV zXG+xc2Wz7zqEGgCI~(e{Esog{7FWy)ZKA(`GOTDI7zV5ejiR^4$O~41crZO=K|z(; z+Vb}?mC533BtDfTzw!=Q^^T*(Td|j4j*>e?K30u>oRs`{4=ndZtS$qqtVdiBv9|P9 zqg8_?K(@AD*a%Ep8|OM=>8H+^2ThK8a=!Qnovw=~Z!XO)ZyNODreo1qBzi<;CS&ni z3T%`VyogYNk+R^;gz8?3wNzuYVck~Jz0#6kZGuvc7OP~F$6r6Nl`(EYb-O8iTBud1 zYZ85Da#ymUr6-7MG#u`T*c(C~vT?mIs8mJO>h^dRlXNM&vK9K)!p>MS6u0+$tu^Uq z*wF%yWMGX?GMCEfw%c);Tv(pNzL@y|~ z(Lz?qQY4|0mU88B_fl2?rJlfUm&w>DHv?v&ji=iBfoC%YUzObznex?AjN}uiF9qhp zp{2g!FJr-ovlPl<45dmHt!R(UcQtfgnu}iS3O~QFlb8s{?A=`J1nZrZ@H)n`L>7FM zcmmaERf(tgK5@#t5__s&=G9OKV=`ZcJz+uS_2}6e>(I(F)YlCx7mO#+2ye6Ey+nM>}`uA{z!iNmZlGX*%y)mLJ$SL z*?>LF1T|2Lp4VY#HsfANp4AWz<@e;3a(rhqA|eudO0&{WmMeWs$TIK%0hp#H90Aax zMuO6^U3-!xJ+u!k6+!W1J=#P+cK|$!!#-ZH>q-{y$H7I3WDED>9D>1YI0Q$(=Z_3? zus>fO=U;LA?{F{$_-S>pKUJvm@%(%Sj+C~;a&s`w!TH&%oc;OfDb>Mvs6Ti}?Dpq} zS$!}LurfuGasDKIC)2(X&LJ58i9Za3(SCpW{zo{SU$PD!-l_d@`+wY@y+0QCRd^tM R;Xf9Z$NyM7^h2)2e*&f7H8KDI literal 0 HcmV?d00001