From 0a25b2ccf850ea41f3b083422f0420822832c540 Mon Sep 17 00:00:00 2001 From: bungeman Date: Mon, 18 Aug 2014 08:07:44 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 SkOTTableName { } struct Record { - SK_OT_USHORT type; SkString name; SkString language; + SK_OT_USHORT type; }; bool next(Record&); -- 2.7.4