[Emacs-diffs] emacs-24 r117259: * font.c (font_make_object): Avoid dangling pointer which may

[Dmitry Antipov]

------------------------------------------------------------
revno: 117259
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-06-19 07:21:07 +0400
message:
  * font.c (font_make_object): Avoid dangling pointer which may
  crash GC (Bug#17771).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-18 15:15:52 +0000
+++ b/src/ChangeLog     2014-06-19 03:21:07 +0000
@@ -1,3 +1,8 @@
+2014-06-19  Dmitry Antipov  <address@hidden>
+
+       * font.c (font_make_object): Avoid dangling pointer which may
+       crash GC (Bug#17771).
+
 2014-06-18  Eli Zaretskii  <address@hidden>
 
        * image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the

=== modified file 'src/font.c'
--- a/src/font.c        2014-03-03 19:58:20 +0000
+++ b/src/font.c        2014-06-19 03:21:07 +0000
@@ -207,6 +207,9 @@
     = (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))