[Emacs-diffs] /srv/bzr/emacs/trunk r99994: Fix Bug#6001.

[Jan D.]

------------------------------------------------------------
revno: 99994
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-22 19:23:18 +0200
message:
  Fix Bug#6001.
  
  * xsettings.c (read_and_apply_settings): Check if current_font is
    NULL before strcmp (Bug#6001).
modified:
  src/ChangeLog
  src/xsettings.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-21 19:32:54 +0000
+++ b/src/ChangeLog     2010-04-22 17:23:18 +0000
@@ -1,3 +1,8 @@
+2010-04-22  Jan Djärv  <address@hidden>
+
+       * xsettings.c (read_and_apply_settings): Check if current_font is
+       NULL before strcmp (Bug#6001).
+
 2010-04-21  Dan Nicolaescu  <address@hidden>
 
        Clean up HP-UX files.

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2010-04-21 18:25:13 +0000
+++ b/src/xsettings.c   2010-04-22 17:23:18 +0000
@@ -578,7 +578,7 @@
 
   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;