[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 76151ceaf3417a987ae2c36b247ca82f50d857f6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jul 24 15:34:20 2014 -0400

    Ouch, fix buffer

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 8a95ee4..9740a14 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -829,7 +829,7 @@ FcSfntNameTranscode (FT_SfntName *sname)
 	*u8 = '\0';
 	goto done;
     }
-    if (!strcmp (fromcode, "MACINTOSH"))
+    if (!strcmp (fromcode, FC_ENCODING_MAC_ROMAN))
     {
 	FcChar8	    *src = sname->string;
 	int	    src_len = sname->string_len;
@@ -840,7 +840,7 @@ FcSfntNameTranscode (FT_SfntName *sname)
 	/*
 	 * Convert Latin1 to Utf8. Freed below
 	 */
-	utf8 = malloc (src_len + 1);
+	utf8 = malloc (src_len * 3 + 1);
 	if (!utf8)
 	    return 0;