diff --git a/ChangeLog b/ChangeLog
index b5b84b4e9..59f0d91d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  Chia-I Wu  <b90201047@ntu.edu.tw>
+
+	* src/base/ftutil.c (ft_mem_qalloc) [FT_STRICT_ALIASING]: Do not
+	return error when size == 0.
+
 2006-02-28  Chia-I Wu  <b90201047@ntu.edu.tw>
 
 	* src/base/ftobjs.c (FT_Done_Library): Modules are removed in the
diff --git a/src/base/ftutil.c b/src/base/ftutil.c
index c02f25b9d..824f92f8c 100644
--- a/src/base/ftutil.c
+++ b/src/base/ftutil.c
@@ -92,7 +92,7 @@
       if ( block == NULL )
         error = FT_Err_Out_Of_Memory;
     }
-    else
+    else if ( size < 0 )
     {
       /* may help catch/prevent security issues */
       error = FT_Err_Invalid_Argument;