* src/cid/cidload.c (cid_parse_dict): Check `[FG]DBytes' size.

9 years ago · 0af21dcf13
parent 38a3dd5566
commit 0af21dcf13
2 changed files with 14 additions and 0 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2015-10-17  Werner Lemberg  <wl@gnu.org>
+
+	* src/cid/cidload.c (cid_parse_dict): Check `[FG]DBytes' size.
+
 2015-10-17  Werner Lemberg  <wl@gnu.org>

 	* src/cid/cidgload.c (cid_glyph_load): Check file offsets (#46222).
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@ -401,6 +401,16 @@
        FT_ERROR(( "cid_parse_dict: No font dictionary found\n" ));
        return FT_THROW( Invalid_File_Format );
      }
+
+      /* allow at most 32bit offsets */
+      if ( face->cid.fd_bytes > 4 || face->cid.gd_bytes > 4 )
+      {
+        FT_ERROR(( "cid_parse_dict:"
+                   " Values of `FDBytes' or `GDBytes' larger than 4\n"
+                   "               "
+                   " are not supported\n" ));
+        return FT_THROW( Invalid_File_Format );
+      }
    }

    return parser->root.error;