2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fb0cc471599..6869116416a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (font_make_object): Avoid dangling pointer which may
+        crash GC (Bug#17771).
+
 2014-06-18  Eli Zaretskii  <eliz@gnu.org>
 
         * image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the
diff --git a/src/font.c b/src/font.c
index b49664b5f31..afa138003f2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -207,6 +207,9 @@ font_make_object (int size, Lisp_Object entity, int pixelsize)
     = (struct font *) allocate_pseudovector (size, FONT_OBJECT_MAX, PVEC_FONT);
   int i;
 
+  /* GC can happen before the driver is set up,
+     so avoid dangling pointer here (Bug#17771).  */
+  font->driver = NULL;
   XSETFONT (font_object, font);
 
   if (! NILP (entity))