=== modified file 'src/font.c'
--- src/font.c	2014-03-03 19:58:20 +0000
+++ src/font.c	2014-06-16 12:32:31 +0000
@@ -207,6 +207,7 @@
     = (struct font *) allocate_pseudovector (size, FONT_OBJECT_MAX, PVEC_FONT);
   int i;
 
+  font->driver = NULL;
   XSETFONT (font_object, font);
 
   if (! NILP (entity))