From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Thu, 19 Jun 2014 03:21:07 +0000 (+0400)
Subject: * font.c (font_make_object): Avoid dangling pointer which may
X-Git-Tag: emacs-24.3.92~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52a6194ff6b327bcd520dc308f346d01e456b0b0;p=emacs.git

* font.c (font_make_object): Avoid dangling pointer which may
crash GC (Bug#17771).
---

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))