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

diff --git a/ChangeLog b/ChangeLog
index b35be7adefa05dfd516359deccabaa356c7e5042..f81c359183ee0c4eff310ca661555edc4bdc9a3f 100644 (file)
--- 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 bc55d2cb9851d7ff2cab3da5efcbb6a9305435aa..2f6f4e6dbeee6918960091cbeea3cbd30d63d36f 100644 (file)
--- 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)
     {