minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

In cid_load_glyph, decrypt charstrings only if lenIV >= 0.

This commit is contained in:
Tom Kacvinsky 2001-03-12 02:05:17 +00:00
parent 9b59f2c385
commit e355d008b3
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cid/cidgload.c
View File

@ -69,7 +69,6 @@
CID_FontDict* dict;
CID_Subrs* cid_subrs = face->subrs + fd_select;
FT_Byte* charstring;
FT_UInt lenIV;
FT_Memory memory = face->root.memory;
@ -80,10 +79,10 @@
/* setup font matrix */
dict = cid->font_dicts + fd_select;
lenIV = dict->private_dict.lenIV;
decoder->font_matrix = dict->font_matrix;
decoder->font_offset = dict->font_offset;
decoder->lenIV = dict->private_dict.lenIV;
/* the charstrings are encoded (stupid!) */
/* load the charstrings, then execute it */
@ -93,10 +92,18 @@
if ( !FILE_Read_At( cid->data_offset + off1, charstring, glyph_len ) )
{
cid_decrypt( charstring, glyph_len, 4330 );
FT_Int cs_offset;
/* Adjustment for seed bytes. */
cs_offset = ( decoder->lenIV >= 0 ? decoder->lenIV : 0 );
/* Decrypt only if lenIV >= 0. */
if ( decoder->lenIV >= 0 )
cid_decrypt( charstring, glyph_len, 4330 );
error = decoder->funcs.parse_charstrings( decoder,
charstring + lenIV,
glyph_len - lenIV );
charstring + cs_offset,
glyph_len - cs_offset );
}
FREE( charstring );