From: wm4 <wm4@nowhere>
Date: Fri, 28 Aug 2015 12:02:19 +0000 (+0200)
Subject: fontconfig: fix error checking
X-Git-Tag: 0.13.0~28^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b658669c0df5ef3adacd92cc29a9e679bd8bdd2f;p=libass

fontconfig: fix error checking

FcInitLoadConfig() could faul, leaving rc=1 and fc->config=NULL, making
FcConfigBuildFonts() potentially crash.

Also, the FcConfigBuildFonts() return value was not checked.
---

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 50ce6c5..0c89d36 100644
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -271,10 +271,9 @@ ass_fontconfig_add_provider(ASS_Library *lib, ASS_FontSelector *selector,
                 "file found, using fallback.");
         FcConfigDestroy(fc->config);
         fc->config = FcInitLoadConfig();
-        rc++;
     }
-    if (rc)
-        FcConfigBuildFonts(fc->config);
+    if (fc->config)
+        rc = FcConfigBuildFonts(fc->config);
 
     if (!rc || !fc->config) {
         ass_msg(lib, MSGL_FATAL,