From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 9 Jul 2006 10:56:42 +0000 (+0000)
Subject: * xftfont.c (xftfont_done_face): Call XftDrawDestroy only if xftface_info
X-Git-Tag: emacs-pretest-23.0.90~8295^2~823
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=773039e8509c6970b79499bac4c2f6fa0d30268f;p=emacs.git

* xftfont.c (xftfont_done_face): Call XftDrawDestroy only if xftface_info
is non-NULL.
---

diff --git a/src/xftfont.c b/src/xftfont.c
index d896e6967e9..bd310cb68b8 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -406,10 +406,13 @@ xftfont_done_face (f, face)
 #endif
 
   xftface_info = (struct xftface_info *) face->extra;
-  BLOCK_INPUT;
-  XftDrawDestroy (xftface_info->xft_draw);
-  UNBLOCK_INPUT;
-  free (xftface_info);
+  if (xftface_info)
+    {
+      BLOCK_INPUT;
+      XftDrawDestroy (xftface_info->xft_draw);
+      UNBLOCK_INPUT;
+      free (xftface_info);
+    }
   face->extra = NULL;
 }