From e6b6f3733ebf4b7f95eb56180f79dbacd21c8d50 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 7 Jan 2007 00:06:47 +0000 Subject: [PATCH] * src/cid/cidparse.c (cid_parser_new): Reject Type 42 CID-keyed fonts. --- ChangeLog | 5 +++++ src/cid/cidparse.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4055424d2..820351086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-07 Werner Lemberg + + * src/cid/cidparse.c (cid_parser_new): Reject Type 42 CID-keyed + fonts. + 2007-01-06 Werner Lemberg * src/cff/cffload.c (cff_index_init): Remove unused variable. diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index ac56363f6..3d342f288 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 parser (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -183,6 +183,11 @@ goto Again; Exit: + if ( !parser->postscript ) + { + FT_TRACE2(( "[not a valid CID-keyed font]\n" )); + error = CID_Err_Unknown_File_Format; + } return error; }