From 758fda728ba5c9d4542ea2385482f7d090ffda0d Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Fri, 28 Feb 2020 23:19:06 +0330 Subject: [PATCH] [glyf] Don't accept gids higher than maxp's glyphs number This specially becomes concerning on sub-components where a gvar table that is sanitized using maxp's glyphs number overflows when a high gid accepted here goes to it, maybe an additional check can be put there also, this however feels to be enough. Fixes https://crbug.com/oss-fuzz/20944 --- src/hb-ot-glyf-table.hh | 1 + ...ase-minimized-hb-draw-fuzzer-5668491560747008 | Bin 0 -> 8771 bytes 2 files changed, 1 insertion(+) create mode 100644 test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5668491560747008 diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh index 7b9206c37..a5dd9d680 100644 --- a/src/hb-ot-glyf-table.hh +++ b/src/hb-ot-glyf-table.hh @@ -847,6 +847,7 @@ struct glyf glyf_table = hb_sanitize_context_t ().reference_table (face); num_glyphs = hb_max (1u, loca_table.get_length () / (short_offset ? 2 : 4)) - 1; + num_glyphs = hb_min (num_glyphs, face->get_num_glyphs ()); } void fini () diff --git a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5668491560747008 b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5668491560747008 new file mode 100644 index 0000000000000000000000000000000000000000..cf9814a132d193cca1689f81d3aef39c2593e75c GIT binary patch literal 8771 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 AR{#J2 literal 0 HcmV?d00001