ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[type42] Fix endless loop (#45920). 

* src/type42/t42parse.c (t42_parse_encoding): Synchronize with
type1's `parse_encoding'.
This commit is contained in:
Werner Lemberg 2015-09-11 08:28:27 +02:00
parent b6eef5ae7b
commit 23423bc6f9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2015-09-11 Werner Lemberg <wl@gnu.org>
[type42] Fix endless loop (#45920).
* src/type42/t42parse.c (t42_parse_encoding): Synchronize with
type1's `parse_encoding'.
2015-09-10 Werner Lemberg <wl@gnu.org>
[docmaker] Allow `-' in bold and italic markup.

17
src/type42/t42parse.c
View File

@ -414,6 +414,13 @@
{
charcode = (FT_Int)T1_ToInt( parser );
T1_Skip_Spaces( parser );
/* protect against invalid charcode */
if ( cur == parser->root.cursor )
{
parser->root.error = FT_THROW( Unknown_File_Format );
return;
}
}
cur = parser->root.cursor;
@ -448,10 +455,10 @@
/* immediates-only mode we would get an infinite loop if */
/* we don't do anything here. */
/* */
/* This encoding array is not valid according to the type1 */
/* specification (it might be an encoding for a CID type1 */
/* font, however), so we conclude that this font is NOT a */
/* type1 font. */
/* This encoding array is not valid according to the */
/* type42 specification (it might be an encoding for a CID */
/* type42 font, however), so we conclude that this font is */
/* NOT a type42 font. */
parser->root.error = FT_THROW( Unknown_File_Format );
return;
}
@ -487,7 +494,7 @@
face->type1.encoding_type = T1_ENCODING_TYPE_ISOLATIN1;
else
parser->root.error = FT_THROW( Ignore );
parser->root.error = FT_ERR( Ignore );
}
}