commit 0a25b2ccf850ea41f3b083422f0420822832c540
author bungeman <bungeman@google.com> Mon Aug 18 08:07:44 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Aug 18 08:07:44 2014 -0700
tree 983e84026c2ce20d32ca9f8f28becabc183446df
parent f92c86642a1875da54d54b447f006cb9dfbbb35c

Correct order for alignment in name iterator record.

We must be quite careful about the order of fields in a 'pragma pack(1)'.
On Android the order 'uint16_t, void*' will misalign the pointer,
potentially leading to a crash.

In the future we should move anything which is not strictly part of the
table definition outside of the packed region.

R=mtklein@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/474313002

src/sfnt/SkOTTable_name.h

diff --git a/src/sfnt/SkOTTable_name.h b/src/sfnt/SkOTTable_name.h
index f3dae40..ab38d72 100644
--- a/src/sfnt/SkOTTable_name.h
+++ b/src/sfnt/SkOTTable_name.h
@@ -560,9 +560,9 @@
         }
 
         struct Record {
-            SK_OT_USHORT type;
             SkString name;
             SkString language;
+            SK_OT_USHORT type;
         };
         bool next(Record&);