freetype: initialise variable and check fontmatch pointer

59132510 · Ilkka Ollakka · ca4d2fc9 · 59132510
Commit 59132510 authored Jul 30, 2009 by Ilkka Ollakka
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

modules/misc/freetype.c modules/misc/freetype.c +2 -2

No files found.
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -298,7 +298,7 @@ static int Create( vlc_object_t *p_this )
 #ifdef HAVE_FONTCONFIG
    FcPattern     *fontpattern, *fontmatch;
-    FcResult       fontresult;
+    FcResult       fontresult = FcResultNoMatch;
 #endif
@@ -366,7 +366,7 @@ static int Create( vlc_object_t *p_this )
    FcDefaultSubstitute( fontpattern );
    fontmatch = FcFontMatch( NULL, fontpattern, &fontresult );
-    if( fontresult == FcResultNoMatch )
+    if( !fontmatch || fontresult == FcResultNoMatch )
    {
        FcPatternDestroy( fontpattern );
        goto error;