From 2994c4d0a653b0d00bb79d45595c76e2d1fa30b8 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 5 Oct 2026 12:42:27 -0600 Subject: [PATCH] [Coverage] Fix cache behavior with out-of-range keys (#6321) Ouch! Fixes https://github.com/harfbuzz/harfbuzz/issues/6320 --- src/OT/Layout/Common/Coverage.hh | 8 ++++---- src/hb-cache.hh | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/OT/Layout/Common/Coverage.hh b/src/OT/Layout/Common/Coverage.hh index 871e2b06a..4b12a9e8f 100644 --- a/src/OT/Layout/Common/Coverage.hh +++ b/src/OT/Layout/Common/Coverage.hh @@ -104,9 +104,9 @@ struct Coverage coverage = get_coverage (glyph_id); if (cache) { if (coverage == NOT_COVERED) - cache->set_unchecked (glyph_id, cache->MAX_VALUE); + cache->set (glyph_id, cache->MAX_VALUE); else if (likely (coverage < cache->MAX_VALUE)) - cache->set_unchecked (glyph_id, coverage); + cache->set (glyph_id, coverage); } return coverage; } @@ -119,9 +119,9 @@ struct Coverage coverage = get_coverage (glyph_id); if (cache) { if (coverage == NOT_COVERED) - cache->set_unchecked (glyph_id, cache->MAX_VALUE); + cache->set (glyph_id, cache->MAX_VALUE); else - cache->set_unchecked (glyph_id, 0); + cache->set (glyph_id, 0); } return coverage; } diff --git a/src/hb-cache.hh b/src/hb-cache.hh index 7600f134f..9ac4ab4c0 100644 --- a/src/hb-cache.hh +++ b/src/hb-cache.hh @@ -106,12 +106,6 @@ struct hb_cache_t { if (unlikely ((key >> key_bits) || (value >> value_bits))) return; /* Overflows */ - set_unchecked (key, value); - } - - HB_HOT - void set_unchecked (unsigned int key, unsigned int value) - { unsigned int k = key & ((1u<>cache_bits)<