[Coverage] Fix cache behavior with out-of-range keys (#6321)

Ouch!

Fixes https://github.com/harfbuzz/harfbuzz/issues/6320
This commit is contained in:
Behdad Esfahbod authored and GitHub committed 2026-10-05 12:42:27 -06:00
1 parent 12ee77ee00
commit 2994c4d0a6
2 files changed
+4 -10

No files matched your search

+4 -4
View File
@@ -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;
}
-6
View File
@@ -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)-1);
unsigned int v = ((key>>cache_bits)<<value_bits) | value;
values[k] = v;