From 99061dfcf68b52602e134fdb1a0bd3417546f7a8 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 30 Jun 2009 22:07:44 +0000
Subject: * xftfont.c (xftfont_open): Avoid passing NULL argument to
 XftLockFace.

---
 src/xftfont.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/xftfont.c')

diff --git a/src/xftfont.c b/src/xftfont.c
index 4a1b488bcf..2dbef2c7f1 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -287,14 +287,15 @@ xftfont_open (f, entity, pixel_size)
   match = XftFontMatch (display, FRAME_X_SCREEN_NUMBER (f), pat, &result);
   FcPatternDestroy (pat);
   xftfont = XftFontOpenPattern (display, match);
-  ft_face = XftLockFace (xftfont);
-  UNBLOCK_INPUT;
-
-  if (! xftfont)
+  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);
-- 
cgit v1.2.3