procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Bug#6001.

Browse source 
* xsettings.c (read_and_apply_settings): Check if current_font is
  NULL before strcmp (Bug#6001).
This commit is contained in:
Jan Djärv 2010-04-22 19:23:18 +02:00
parent 4e7f249cba
commit a0d0b56337
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
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.

2
src/xsettings.c
View file

@ -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;