From a3fa7d33360a58df5333dbbd121328e580f08849 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 14 Jan 2019 14:37:36 -0500 Subject: [PATCH] [AAT] Fix ankr table access Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=918340 --- src/hb-aat-layout-ankr-table.hh | 7 ++++--- ...se-minimized-harfbuzz_fuzzer-5126525414014976 | Bin 0 -> 1141 bytes 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5126525414014976 diff --git a/src/hb-aat-layout-ankr-table.hh b/src/hb-aat-layout-ankr-table.hh index 4235b363a..497b2ea2f 100644 --- a/src/hb-aat-layout-ankr-table.hh +++ b/src/hb-aat-layout-ankr-table.hh @@ -69,8 +69,8 @@ struct ankr if (!offset) return Null(Anchor); const GlyphAnchors &anchors = StructAtOffset (&(this+anchorData), *offset); - /* TODO Use sanitizer; to avoid overflows and more. */ - if (unlikely ((const char *) &anchors + anchors.get_size () > end)) + if (unlikely (end - (const char *) &anchors < anchors.len.static_size || + end - (const char *) &anchors < anchors.get_size ())) return Null(Anchor); return anchors[i]; } @@ -80,7 +80,8 @@ struct ankr TRACE_SANITIZE (this); return_trace (likely (c->check_struct (this) && version == 0 && - lookupTable.sanitize (c, this))); + lookupTable.sanitize (c, this) && + anchorData.sanitize (c, this) /* Just one byte. */)); } protected: diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5126525414014976 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-5126525414014976 new file mode 100644 index 0000000000000000000000000000000000000000..74cc0273bdbe1dd59c2c67dfc120e7a4e2eb0f61 GIT binary patch literal 1141 zcmaJ=-%Aux6#nkaIE`ktS}hV(TNt6GAf-qYEU{UF4@LzRL5#Vpo8}I?O9eeR55DGq z5WPl)&q?5m|A4(kQAh?whT20JSl+&KXC0QZ4$Pf%&+l`-bD;n@=tmb$_~WBROr;ws zNkeISG+VrP6>iA;>0$qP0KC404_7=aX|0h=LT6IcF@gkvlaw1^o3nCUq*5Q&`fQDj zT_RKP8d5+T(spUANP&e7i0VG3FuDE^Px1U`Oqjzw-r_UXl%pEd0d-7ut4DZ-89c^I zyu*zp{7^LsQ-Fjgr5MXcb6z3A&V)jZod^w^IoE?7`@bw|eQOb58{#Qno;|z9gw1Wh zOOg-Gok#PTj{d6NX<^8sg9VS(dyLTtHKD(eQSddL{MH<%gFD$AGC`@FK;Pil-5eD8 z5(dmUc(5`$rgBkB#}-q=9O}sn%_a0eo-bN>(GpAP??_2%PiWAheMFRVkJfhi6M)w+O?~Mf! zBWWUTMH=T0ZAAjoU-Ery%`#|wRko|MI39*GyfArtfsM&+5+cgsHP8Q?df!%bWO literal 0 HcmV?d00001