Fix fontconfig memory leaks

Do not manually use FcConfigFilename; passing a NULL pointer to
FcConfigParseAndLoad is just as effective and also avoids a memory leak
since the string allocated by FcConfigFilename was never freed.

Free FcConfig instance in fontconfig_done; since we're not using the
default configuration anymore it doesn't make sense to keep the
configuration around.

Leaks were found by valgrind/memcheck.

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index bff8bed6619617cfac6b6061b6dcce412de82cc7..eb75c0badaac9e1d6f0cb6ee39f9ba3f55f749c5 100644 (file)
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -448,9 +448,6 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
         goto exit;
     }
 
-    if (!config)
-        config = (char *) FcConfigFilename(NULL);
-
     priv->config = FcConfigCreate();
     rc = FcConfigParseAndLoad(priv->config, (unsigned char *) config, FcTrue);
     if (!rc) {
@@ -567,7 +564,8 @@ int fontconfig_update(fc_instance_t *priv)
 
 void fontconfig_done(fc_instance_t *priv)
 {
-    // don't call FcFini() here, library can still be used by some code
+    if (priv && priv->config)
+        FcConfigDestroy(priv->config);
     if (priv && priv->path_default)
         free(priv->path_default);
     if (priv && priv->family_default)