From: Patrick Lam <plam@MIT.EDU>
Date: Mon, 10 Apr 2006 21:04:54 +0000 (+0000)
Subject: Swap typo in order of ALIGN and dereferencing, fixing bug 6529.
X-Git-Tag: fc-2_3_95~19
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ac0010940e626cb9193bb4ad0271f3820c7225ee;p=fontconfig.git

Swap typo in order of ALIGN and dereferencing, fixing bug 6529.
---

diff --git a/ChangeLog b/ChangeLog
index b35be7a..f81c359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-07  Patrick Lam  <plam@mit.edu>
+	* src/fcname.c (FcObjectUnserialize):
+
+	Swap typo in order of ALIGN and dereferencing, fixing bug 6529.
+
 2006-04-10  Frederic Crozat  <fcrozat@mandriva.com>
 	reviewed by: plam
 	
diff --git a/src/fcname.c b/src/fcname.c
index bc55d2c..2f6f4e6 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -373,8 +373,8 @@ void *
 FcObjectUnserialize (FcCache * metadata, void *block_ptr)
 {
     int new_biggest;
-    new_biggest = *(int *)block_ptr;
     block_ptr = ALIGN (block_ptr, int);
+    new_biggest = *(int *)block_ptr;
     block_ptr = (int *) block_ptr + 1;
     if (biggest_known_ntypes < new_biggest)
     {