Rename some X-terminated members to Z-terminated X-terminated means don't access this, it's not located correctly. Z-terminated means this is a C array with no bound checking.
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index efbaa7a..1f22b18 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh
@@ -1201,18 +1201,18 @@ { len.set (v); assert (len == v); - entrySelectorZ.set (MAX (1u, _hb_bit_storage (v)) - 1); - searchRangeZ.set (16 * (1u << entrySelectorZ)); - rangeShiftZ.set (v * 16 > searchRangeZ - ? 16 * v - searchRangeZ - : 0); + entrySelector.set (MAX (1u, _hb_bit_storage (v)) - 1); + searchRange.set (16 * (1u << entrySelector)); + rangeShift.set (v * 16 > searchRange + ? 16 * v - searchRange + : 0); } protected: HBUINT16 len; - HBUINT16 searchRangeZ; - HBUINT16 entrySelectorZ; - HBUINT16 rangeShiftZ; + HBUINT16 searchRange; + HBUINT16 entrySelector; + HBUINT16 rangeShift; public: DEFINE_SIZE_STATIC (8);