From 99061dfcf68b52602e134fdb1a0bd3417546f7a8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 30 Jun 2009 22:07:44 +0000 Subject: [PATCH] * xftfont.c (xftfont_open): Avoid passing NULL argument to XftLockFace. --- src/ChangeLog | 5 +++++ src/xftfont.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b06bf4fac8c..c1477bc2555 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-06-30 Chong Yidong + + * xftfont.c (xftfont_open): Avoid passing NULL argument to + XftLockFace. + 2009-06-30 Jason Rumney * w32term.c (w32_initialize): Use GetModuleHandle for library that diff --git a/src/xftfont.c b/src/xftfont.c index 4a1b488bcf9..2dbef2c7f17 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); -- 2.39.2