Merge from emacs--devo--0

[gnu-emacs] / src / xftfont.c

diff --git a/src/xftfont.c b/src/xftfont.c
index d896e6967e9229fe7f9be750680c797076abab80..bd310cb68b867a7dc0f7c97cb698afa4f05050fc 100644 (file)
--- 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;
 }