sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix invalid memory access in font engine

Browse source 
acess of member face->num_faces after free()
fixed by making local copy num_faces before FT_Done_Face(face)
This commit is contained in:
Datendelphin 2012-03-23 17:33:35 +01:00
parent e9940c6add
commit 30f59aac0c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/font_engine_freetype.cpp
View file

@ -83,10 +83,11 @@ bool freetype_engine::register_font(std::string const& file_name)
} }
FT_Face face = 0; FT_Face face = 0;
int num_faces = 0;
// some font files have multiple fonts in a file // some font files have multiple fonts in a file
// the count is in the 'root' face library[0] // the count is in the 'root' face library[0]
// see the FT_FaceRec in freetype.h // see the FT_FaceRec in freetype.h
for ( int i = 0; face == 0 || i < face->num_faces; i++ ) { for ( int i = 0; face == 0 || i < num_faces; i++ ) {
// if face is null then this is the first face // if face is null then this is the first face
error = FT_New_Face (library,file_name.c_str(),i,&face); error = FT_New_Face (library,file_name.c_str(),i,&face);
if (error) if (error)
@ -94,6 +95,9 @@ bool freetype_engine::register_font(std::string const& file_name)
FT_Done_FreeType(library); FT_Done_FreeType(library);
return false; return false;
} }
// store num_faces locally, after FT_Done_Face it can not be accessed any more
if (!num_faces)
num_faces = face->num_faces;
// some fonts can lack names, skip them // some fonts can lack names, skip them
// http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec // http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec
if (face->family_name && face->style_name) { if (face->family_name && face->style_name) {