[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-kern-table.hh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 210f899acad1959d60892538ac1968a36dbbb51b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 9 21:56:37 2018 -0400

    [kern] Sanitize 4 bytes, not 2

diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh
index 0ab9322f..ee237020 100644
--- a/src/hb-ot-kern-table.hh
+++ b/src/hb-ot-kern-table.hh
@@ -430,7 +430,7 @@ struct kern
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.major.sanitize (c)) return_trace (false);
+    if (!u.version32.sanitize (c)) return_trace (false);
     switch (u.major) {
     case 0: return_trace (u.ot.sanitize (c));
     case 1: return_trace (u.aat.sanitize (c));
@@ -480,13 +480,13 @@ struct kern
 
   protected:
   union {
-  HBUINT16		major;
   HBUINT32		version32;
+  HBUINT16		major;
   KernOT		ot;
   KernAAT		aat;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, major);
+  DEFINE_SIZE_UNION (4, version32);
 };
 
 struct kern_accelerator_t : kern::accelerator_t {};