From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 22 Feb 2010 21:03:15 +0000 (-0500)
Subject: Ensure proper alignment of NullPool
X-Git-Tag: 1.27.1~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab8d5f6df3171197a7d3913bdf2195bca90fe6de;p=platform%2Fupstream%2Fpango.git

Ensure proper alignment of NullPool

Bug 593240 - (pangoosx) Crash / infinite loop with Mac OS X
---

diff --git a/pango/opentype/hb-open-type-private.hh b/pango/opentype/hb-open-type-private.hh
index 65e4950..f460f1a 100644
--- a/pango/opentype/hb-open-type-private.hh
+++ b/pango/opentype/hb-open-type-private.hh
@@ -61,7 +61,7 @@
 /* Null objects */
 
 /* Global nul-content Null pool.  Enlarge as necessary. */
-static const char NullPool[32] = "";
+static const void *NullPool[32 / sizeof (void *)];
 
 /* Generic template for nul-content sizeof-sized Null objects. */
 template <typename Type>