Merge branch 'master' into cff-check-blends

2018-12-05 21:37:38 -08:00 · 2018-12-05 21:37:38 -08:00 · 1ccbdcf73b
parent 14d29a1043 f95324a335
commit 1ccbdcf73b
2 changed files with 1 additions and 1 deletions
--- a/src/hb-ot-cff2-table.hh
+++ b/src/hb-ot-cff2-table.hh
@ -115,7 +115,7 @@ struct CFF2VariationStore
  inline bool sanitize (hb_sanitize_context_t *c) const
  {
    TRACE_SANITIZE (this);
-    return_trace (likely (c->check_struct (this)) && varStore.sanitize (c));
+    return_trace (likely (c->check_struct (this)) && c->check_range (&varStore, size) && varStore.sanitize (c));
  }

  inline bool serialize (hb_serialize_context_t *c, const CFF2VariationStore *varStore)
--- a/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5660711141769216
+++ b/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5660711141769216