[HB] Tag sanitize()

diff --git a/src/hb-open-types-private.hh b/src/hb-open-types-private.hh
index 8e325d738e0537c0e69e6c82c71d926631213ac9..d923b884929426883dfd72edbd23de54e8bbc31f 100644 (file)
--- a/src/hb-open-types-private.hh
+++ b/src/hb-open-types-private.hh
@@ -282,6 +282,14 @@ struct Tag : ULONG
   /* What the char* converters return is NOT nul-terminated.  Print using "%.4s" */
   inline operator const char* (void) const { return CONST_CHARP(this); }
   inline operator char* (void) { return CHARP(this); }
+
+  inline bool sanitize (SANITIZE_ARG_DEF) {
+    /* Note: Only accept ASCII-visible tags (mind DEL)
+     * This is one of the few times (only time?) we check
+     * for data integrity, as opposed o just boundary checks
+     */
+    return SANITIZE_SELF () && (((uint32_t) *this) & 0x80808080) == 0;
+  }
 };
 ASSERT_SIZE (Tag, 4);
 #define _NULL_TAG_INIT  {' ', ' ', ' ', ' '}

diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index 18b19094311a9d5c44a78f9e5c855bcb7e4bfde2..1fbec021cae2f81d0b31d92cb3bc3d841b094865 100644 (file)
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -47,11 +47,7 @@ template <typename Type>
 struct Record
 {
   inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
-    /* Note: Only accept ASCII-visible tags (mind DEL)
-     * This is one of the few times (only time?) we check
-     * for data integrity, as opposed o just boundary checks
-     */
-    return (tag & 0x80808080) == 0 && offset.sanitize (SANITIZE_ARG, base);
+    return SANITIZE (tag) == 0 && SANITIZE_BASE (offset, base);
   }
 
   Tag          tag;            /* 4-byte Tag identifier */