diff --git a/ChangeLog b/ChangeLog
index ff94a670c..d9d72fd84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-19  Dirck Blaskey  <listtarget@danbala.com>
+
+	* src/cff/cffload (cff_encoding_load): `nleft' must be FT_UInt,
+	otherwise adding 1 might wrap the result.
+
 2003-06-18  Werner Lemberg  <wl@gnu.org>
 
 	* src/psnames/psmodule.c (ps_unicode_value): Add support to
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 181b52faf..cc95e790e 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1778,7 +1778,7 @@
 
       case 1:
         {
-          FT_Byte  nleft;
+          FT_UInt  nleft;
           FT_UInt  i = 1;
           FT_UInt  k;