# HG changeset patch
# User Didier Verna <didier@xemacs.org>
# Date 1262782598 -3600
# Node ID 591091481f20b8dd60caf78f9c0602c6cb0db53b
# Parent  b828e06dbe388f57b5f3be47bc2ee60b94940eb2# Parent  ca99a807b0253bed0144b72532839ac9f73209bb
Merge changeset #b828e06dbe38 with tip

diff -r b828e06dbe38 -r 591091481f20 src/ChangeLog
--- a/src/ChangeLog	Wed Jan 06 13:48:25 2010 +0100
+++ b/src/ChangeLog	Wed Jan 06 13:56:38 2010 +0100
@@ -1,3 +1,8 @@
+2010-01-05  Jerry James  <james@xemacs.org>
+
+	* font-mgr.c (Ffc_name_unparse): Return value of FcNameUnparse
+	must be freed.
+
 2009-12-31  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* eval.c (Ffunctionp): 
diff -r b828e06dbe38 -r 591091481f20 src/font-mgr.c
--- a/src/font-mgr.c	Wed Jan 06 13:48:25 2010 +0100
+++ b/src/font-mgr.c	Wed Jan 06 13:56:38 2010 +0100
@@ -260,8 +260,13 @@
 */
       (pattern))
 {
+  FcChar8 *name;
+  Lisp_Object result;
   CHECK_FCPATTERN(pattern);
-  return build_fcapi_string (FcNameUnparse (XFCPATTERN_PTR (pattern)));
+  name = FcNameUnparse (XFCPATTERN_PTR (pattern));
+  result = build_fcapi_string (name);
+  xfree (name, FcChar8 *);
+  return result;
 }
 
 DEFUN("fc-pattern-duplicate", Ffc_pattern_duplicate, 1, 1, 0, /*