ref: 445241589d3f3c45a9fda8f0a1f49806812cb9d0
parent: c9de9cbd56caea5ceeab8d984e71441803c41aef
author: suzuki toshiya <[email protected]>
date: Fri Aug 6 21:46:56 EDT 2010
Fix Savannah bug #30648. * src/base/ftobjs.c (FT_Done_Library): Specify the order of font drivers in face closing process. Type42 faces should be closed before TrueType faces, because a Type42 face refers another internal TrueType face which is created from sfnt[] array on the memory.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-06 suzuki toshiya <[email protected]>
+
+ Fix Savannah bug #30648.
+
+ * src/base/ftobjs.c (FT_Done_Library): Specify the order of font
+ drivers in face closing process. Type42 faces should be closed
+ before TrueType faces, because a Type42 face refers another
+ internal TrueType face which is created from sfnt[] array on the
+ memory.
+
2010-08-06 Yuriy Kaminskiy <[email protected]>
[raster] Fix valgrind warning.
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4416,26 +4416,42 @@
* - if the pshinter module is destroyed before the cff font driver,
* opened FT_Face objects managed by the driver are not properly
* destroyed, resulting in a memory leak
+ *
+ * Some faces are dependent with other faces, like Type42 faces that
+ * depends on TrueType face synthesized internally.
+ * The order of driver should be described in driver_name[].
*/
{- FT_UInt n;
+ FT_UInt m, n;
+ const char* driver_name[] = { "type42", NULL };- for ( n = 0; n < library->num_modules; n++ )
+ for ( m = 0;
+ m < sizeof( driver_name ) / sizeof( driver_name[0] );
+ m ++ )
{- FT_Module module = library->modules[n];
- FT_List faces;
+ for ( n = 0; n < library->num_modules; n++ )
+ {+ FT_Module module = library->modules[n];
+ const char* module_name = module->clazz->module_name;
+ FT_List faces;
- if ( ( module->clazz->module_flags & FT_MODULE_FONT_DRIVER ) == 0 )
- continue;
+ if ( driver_name[m] &&
+ 0 != ft_strcmp( module_name, driver_name[m] ) )
+ continue;
- faces = &FT_DRIVER(module)->faces_list;
- while ( faces->head )
- {- FT_Done_Face( FT_FACE( faces->head->data ) );
- if ( faces->head )
- FT_TRACE0(( "FT_Done_Library: failed to free some faces\n" ));
+ if ( ( module->clazz->module_flags & FT_MODULE_FONT_DRIVER ) == 0 )
+ continue;
+
+ FT_TRACE7(( "FT_Done_Library: close faces for %s\n", module_name ));
+ faces = &FT_DRIVER(module)->faces_list;
+ while ( faces->head )
+ {+ FT_Done_Face( FT_FACE( faces->head->data ) );
+ if ( faces->head )
+ FT_TRACE0(( "FT_Done_Library: failed to free some faces\n" ));
+ }
}
}
}