From a0d0b56337892f81aae659d7a14cc91986f0b7fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 22 Apr 2010 19:23:18 +0200 Subject: [PATCH] Fix Bug#6001. * xsettings.c (read_and_apply_settings): Check if current_font is NULL before strcmp (Bug#6001). --- src/ChangeLog | 5 +++++ src/xsettings.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c0b17d0d867..6588549e496 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-04-22 Jan Djärv + + * xsettings.c (read_and_apply_settings): Check if current_font is + NULL before strcmp (Bug#6001). + 2010-04-21 Dan Nicolaescu Clean up HP-UX files. diff --git a/src/xsettings.c b/src/xsettings.c index 2dd7f70eb60..4d128f19dd2 100644 --- a/src/xsettings.c +++ b/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; -- 2.39.5