[Emacs-diffs] emacs/src ChangeLog xftfont.c [EMACS_23_1_RC]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Chong Yidong <cyd>      09/06/30 22:08:59

Modified files:
        src            : ChangeLog xftfont.c 

Log message:
        * xftfont.c (xftfont_open): Avoid passing NULL argument to
        XftLockFace.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.8&r2=1.7586.2.9
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.24&r2=1.24.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.8
retrieving revision 1.7586.2.9
diff -u -b -r1.7586.2.8 -r1.7586.2.9
--- ChangeLog   30 Jun 2009 12:18:58 -0000      1.7586.2.8
+++ ChangeLog   30 Jun 2009 22:08:57 -0000      1.7586.2.9
@@ -1,3 +1,8 @@
+2009-06-30  Chong Yidong  <address@hidden>
+
+       * xftfont.c (xftfont_open): Avoid passing NULL argument to
+       XftLockFace.
+
 2009-06-28  David Reitter <address@hidden>
 
        * nsterm.m (keydown): Avoid infinite loop.

Index: xftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/xftfont.c,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -b -r1.24 -r1.24.2.1
--- xftfont.c   11 May 2009 09:29:49 -0000      1.24
+++ xftfont.c   30 Jun 2009 22:08:59 -0000      1.24.2.1
@@ -287,14 +287,15 @@
   match = XftFontMatch (display, FRAME_X_SCREEN_NUMBER (f), pat, &result);
   FcPatternDestroy (pat);
   xftfont = XftFontOpenPattern (display, match);
-  ft_face = XftLockFace (xftfont);
-  UNBLOCK_INPUT;
-
   if (! xftfont)
     {
+      UNBLOCK_INPUT;
       XftPatternDestroy (match);
       return Qnil;
     }
+  ft_face = XftLockFace (xftfont);
+  UNBLOCK_INPUT;
+
   /* We should not destroy PAT here because it is kept in XFTFONT and
      destroyed automatically when XFTFONT is closed.  */
   font_object = font_make_object (VECSIZE (struct xftfont_info), entity, size);