From 8fe344db5169af4a9e4dda2661046162350b7b1d Mon Sep 17 00:00:00 2001 From: Thomas Thurman Date: Thu, 5 Apr 2007 18:45:03 +0000 Subject: [PATCH] if theme is invalid and therefore got freed, don't attempt to read from 2007-04-05 Thomas Thurman * src/theme_parser.c: if theme is invalid and therefore got freed, don't attempt to read from it. Closes #423855. svn path=/trunk/; revision=3172 --- ChangeLog | 6 ++++++ src/theme-parser.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c75ce5868..e22233e4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-05 Thomas Thurman + + * src/theme_parser.c: if theme is invalid and therefore got + freed, don't attempt to read from it. Closes #423855. + 2007-04-05 Bastien Nocera * src/50-metacity-desktop-key.xml.in: @@ -202,6 +207,7 @@ * src/window.c (meta_window_new_with_attrs): new hooks to handle new atom +>>>>>>> .r3171 2007-03-26 Josselin Mouette * src/session.c (meta_session_init): if previous client ID diff --git a/src/theme-parser.c b/src/theme-parser.c index 68db8e79e..ae11b8389 100644 --- a/src/theme-parser.c +++ b/src/theme-parser.c @@ -4610,7 +4610,8 @@ meta_theme_load (const char *theme_name, g_markup_parse_context_free (context); g_free (text); - info.theme->format_version = info.format_version; + if (info.theme) + info.theme->format_version = info.format_version; if (error) {