diff --git a/ChangeLog b/ChangeLog
index b6f4d7792..a1e66e069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-27  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* src/cid/cidgload.c (cid_load_glyph): Restore the glyph_length check.
+
 2021-04-27  Werner Lemberg  <wl@gnu.org>
 
 	* src/psmodule.c (ps_unicodes_init): Ignore empty glyph names.
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 4dd98346a..bd0a7e7fb 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -131,7 +131,8 @@
 
       glyph_length = off2 - off1;
 
-      if ( FT_QALLOC( charstring, glyph_length )         ||
+      if ( glyph_length == 0                             ||
+           FT_QALLOC( charstring, glyph_length )         ||
            FT_STREAM_READ_AT( cid->data_offset + off1,
                               charstring, glyph_length ) )
         goto Exit;