rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/type1/t1parse.c (T1_Get_Private_Dict): Skip exactly one 

CR, LF, or CR/LF after `eexec'.
This commit is contained in:
Werner Lemberg 2004-01-19 23:31:56 +00:00
parent 323fde5c6d
commit 30b5f15593
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,8 @@
2004-01-20 Werner Lemberg <wl@gnu.org>
* src/type1/t1parse.c (T1_Get_Private_Dict): Skip exactly one
CR, LF, or CR/LF after `eexec'.
2004-01-18 David Turner <david@freetype.org>
* src/sfnt/ttsbit.c: removed compiler warning
@ -31,7 +36,6 @@
introducing the new FT_ARRAY_COPY and FT_ARRAY_MOVE macros
to make copying arrays easier
2004-01-14 Werner Lemberg <wl@gnu.org>
* src/cff/cffload.c (cff_font_load): Load charstrings_index earlier.

16
src/type1/t1parse.c
View File

@ -356,8 +356,22 @@
parser->root.limit = parser->base_dict + parser->base_len;
T1_Skip_PS_Token( parser );
T1_Skip_Spaces ( parser );
cur = parser->root.cursor;
if ( *cur == '\r' )
{
cur++;
if ( *cur == '\n' )
cur++;
}
else if ( *cur == '\n' )
cur++;
else
{
FT_ERROR(( "T1_Get_Private_Dict:" ));
FT_ERROR(( " `eexec' not properly terminated\n" ));
error = T1_Err_Invalid_File_Format;
goto Exit;
}
size = (FT_Long)( parser->base_len - ( cur - parser->base_dict ) );