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

Fix memory leak described in Savannah bug #16768 

* src/type1/t1afm.c (T1_Read_Metrics): fix memory leak
  which happened when the metrics file doesn't have kerning
  pairs.
This commit is contained in:
David Turner 2006-06-07 05:11:50 +00:00
parent f1a23cbf0f
commit 5f1f75076c
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-06-07 David Turner <david@freetype.org>
Fix memory leak described in Savannah bug #16768
* src/type1/t1afm.c (T1_Read_Metrics): fix memory leak
which happened when the metrics file doesn't have kerning
pairs.
2006-06-06 David Turner <david@freetype.org>
Fix memory leak described in Savannah bug #16759.

18
src/type1/t1afm.c
View File

@ -73,7 +73,7 @@
#undef KERN_INDEX
#define KERN_INDEX( g1, g2 ) ( ( (FT_ULong)g1 << 16 ) | g2 )
#define KERN_INDEX( g1, g2 ) ( ( (FT_ULong)(g1) << 16 ) | (g2) )
/* compare two kerning pairs */
@ -233,14 +233,9 @@
T1_Font t1_font = &( (T1_Face)t1_face )->type1;
if ( FT_NEW( fi ) )
return error;
if ( FT_FRAME_ENTER( stream->size ) )
{
FT_FREE( fi );
return error;
}
if ( FT_NEW( fi ) ||
FT_FRAME_ENTER( stream->size ) )
goto Exit;
fi->FontBBox = t1_font->font_bbox;
fi->Ascender = t1_font->font_bbox.yMax;
@ -292,11 +287,16 @@
{
t1_face->face_flags |= FT_FACE_FLAG_KERNING;
( (T1_Face)t1_face )->afm_data = fi;
fi = NULL;
}
}
FT_FRAME_EXIT();
Exit:
if ( fi != NULL )
T1_Done_Metrics( memory, fi );
return error;
}