diff --git a/ChangeLog b/ChangeLog
index a71cb866c..442b4f3b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2015-10-15  Kostya Serebryany <kcc@google.com>
+2015-10-15  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidload.c (cid_parse_dict): Handle invalid input (#46220).
+
+2015-10-15  Kostya Serebryany  <kcc@google.com>
 
 	[ftfuzzer] Add README.
 
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index e23b82f67..c94b881ea 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -395,7 +395,14 @@
 
         cur = parser->root.cursor;
       }
+
+      if ( !face->cid.num_dicts )
+      {
+        FT_ERROR(( "cid_parse_dict: No font dictionary found\n" ));
+        return FT_THROW( Invalid_File_Format );
+      }
     }
+
     return parser->root.error;
   }