# HG changeset patch # User reimar # Date 1165404529 0 # Node ID aecea8c8afeebd78e540c0b9e7e3a18bbcebd436 # Parent e7e7f397f991c1e4766dd62c9b833e3c7fd0e3d8 Properly free fontconfig patterns diff -r e7e7f397f991 -r aecea8c8afee libvo/font_load_ft.c --- a/libvo/font_load_ft.c Wed Dec 06 10:46:50 2006 +0000 +++ b/libvo/font_load_ft.c Wed Dec 06 11:28:49 2006 +0000 @@ -1140,6 +1140,7 @@ { #ifdef HAVE_FONTCONFIG FcPattern *fc_pattern; + FcPattern *fc_pattern2; FcChar8 *s; FcBool scalable; #endif @@ -1160,18 +1161,23 @@ fc_pattern = FcNameParse(font_name); FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcDefaultSubstitute(fc_pattern); + fc_pattern2 = fc_pattern; fc_pattern = FcFontMatch(0, fc_pattern, 0); + FcPatternDestroy(fc_pattern2); FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable); if (scalable != FcTrue) { + FcPatternDestroy(fc_pattern); fc_pattern = FcNameParse("sans-serif"); FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcDefaultSubstitute(fc_pattern); + fc_pattern2 = fc_pattern; fc_pattern = FcFontMatch(0, fc_pattern, 0); + FcPatternDestroy(fc_pattern2); } // s doesn't need to be freed according to fontconfig docs FcPatternGetString(fc_pattern, FC_FILE, 0, &s); vo_font=read_font_desc_ft(s, width, height); - free(fc_pattern); + FcPatternDestroy(fc_pattern); } else #endif