diff --git a/ChangeLog b/ChangeLog
index 3ee8b5818..4979348e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-26  Werner Lemberg  <wl@gnu.org>
+
+	[cid] Fix commit from 2016-05-16.
+
+	* src/cid/cidparse.c (cid_parser_new): Fix off-by-one errors.
+
 2016-08-26  Werner Lemberg  <wl@gnu.org>
 
 	[sfnt] Cache offset and size to bitmap data table.
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index cca4363e1..cb07c4509 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -199,7 +199,7 @@
     limit = parser->root.limit;
     cur   = parser->root.cursor;
 
-    while ( cur < limit - SFNTS_LEN )
+    while ( cur <= limit - SFNTS_LEN )
     {
       if ( parser->root.error )
       {
@@ -208,7 +208,7 @@
       }
 
       if ( cur[0] == 'S'                                           &&
-           cur < limit - STARTDATA_LEN                             &&
+           cur <= limit - STARTDATA_LEN                            &&
            ft_strncmp( (char*)cur, STARTDATA, STARTDATA_LEN ) == 0 )
       {
         if ( ft_strncmp( (char*)arg1, "(Hex)", 5 ) == 0 )