kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index f356f81..d694fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-06  David Turner  <david@freetype.org>
+
+	* src/base/ftbimap.c (ft_bitmap_assure_buffer): fixed buffer-overwrite bug
+
+
 2007-04-04  Werner Lemberg  <wl@gnu.org>
 
 	* Version 2.3.3 released.
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 9167653..4c1cdf2 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -149,15 +149,15 @@
       if ( bit_last < bit_width )
       {
         FT_Byte*  line  = bitmap->buffer + ( bit_last >> 3 );
+        FT_Byte*  end   = bitmap->buffer + pitch;
         FT_Int    shift = bit_last & 7;
         FT_UInt   mask  = 0xFF00U >> shift;
         FT_Int    count = height;
 
 
-        for ( ; count > 0; count--, line += pitch )
+        for ( ; count > 0; count--, line += pitch, end += pitch )
         {
           FT_Byte*  write = line;
-          FT_Byte*  end   = line + pitch;
 
 
           if ( shift > 0 )