[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcfreetype.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 106c4f73119e00a7804ef79ee556f1111d680e32
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jan 16 07:05:07 2013 -0600

    Minor

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 9ac2fa9..faf3c35 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1706,7 +1706,8 @@ FcFreeTypeQueryFace (const FT_Face  face,
     {
 	const char *font_format = FT_Get_X11_Font_Format (face);
 	if (font_format)
-	    FcPatternAddString (pat, FC_FONTFORMAT, (FcChar8 *) font_format);
+	    if (!FcPatternAddString (pat, FC_FONTFORMAT, (FcChar8 *) font_format))
+		goto bail2;
     }
 #endif