Fix Bug#6001.

* xsettings.c (read_and_apply_settings): Check if current_font is
  NULL before strcmp (Bug#6001).

src/ChangeLog

+2010-04-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xsettings.c (read_and_apply_settings): Check if current_font is
+	NULL before strcmp (Bug#6001).
+
 2010-04-21  Dan Nicolaescu  <dann@ics.uci.edu>
 	Clean up HP-UX files.

src/xsettings.c

@@ -578,7 +578,7 @@ read_and_apply_settings (dpyinfo, send_event_p)
 
   if (settings.seen & SEEN_FONT)
     {
-      if (strcmp (current_font, settings.font) != 0) 
+      if (!current_font || strcmp (current_font, settings.font) != 0) 
         {
           free (current_font);
           current_font = settings.font;