(font_update_drivers): Fix crash when no drivers match.

2 files changed, 9 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e24f83b15b..f3a7ec0468e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-15  Andreas Schwab  <schwab@suse.de>
+
+        * font.c (font_update_drivers): Fix crash when no drivers match.
+
 2008-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
diff --git a/src/font.c b/src/font.c
index ead3a6a59a8..9667e031bcf 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3272,7 +3272,7 @@ font_update_drivers (f, new_drivers)
   if (! EQ (new_drivers, Qt))
     {
       /* Re-order the driver list according to new_drivers.  */
-      struct font_driver_list **list_table, *list;
+      struct font_driver_list **list_table, **next;
       Lisp_Object tail;
       int i;
 
@@ -3290,15 +3290,13 @@ font_update_drivers (f, new_drivers)
           list_table[i] = list;
       list_table[i] = NULL;
 
-      f->font_driver_list = list = NULL;
+      next = &f->font_driver_list;
       for (i = 0; list_table[i]; i++)
         {
-          if (list)
-            list->next = list_table[i], list = list->next;
-          else
-            f->font_driver_list = list = list_table[i];
+          *next = list_table[i];
+          next = &(*next)->next;
         }
-      list->next = NULL;
+      *next = NULL;
     }
 
   for (list = f->font_driver_list; list; list = list->next)