Mercurial > hg > xemacs-beta

diff src/font-mgr.h @ 5818:15b0715c204d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid passing patterns to with charset property to FcNameUnparse. Prevents crash reported by Raymond Toy.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sat, 18 Oct 2014 21:20:42 +0900
parents 308d34e9f07d
children 6928877dbc26
line wrap: on
line diff
--- a/src/font-mgr.h	Sun Oct 12 07:17:55 2014 +0200
+++ b/src/font-mgr.h	Sat Oct 18 21:20:42 2014 +0900
@@ -144,8 +144,9 @@
 #define PRINT_XFT_PATTERN(level,format,pattern)			\
   do {								\
     DECLARE_EISTRING (eistrpxft_name);				\
-    Extbyte *name = (Extbyte *) FcNameUnparse (pattern);	\
-								\
+    Extbyte *name;						\
+    FcPatternDel(pattern, FC_CHARSET);				\
+    name = (Extbyte *) FcNameUnparse (pattern);			\
     eicpy_ext(eistrpxft_name,					\
               name ? name : "FONT WITH NULL NAME",		\
               Qfc_font_name_encoding);				\