diff options
| author | Thomas Thurman <thomas@thurman.org.uk> | 2007-04-05 18:45:03 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2007-04-05 18:45:03 +0000 |
| commit | 8fe344db5169af4a9e4dda2661046162350b7b1d (patch) | |
| tree | 62d07c15f65741346c19d73e28b5acfff53678d1 | |
| parent | f32712937b96f4b7540dea348b42ac24644cc845 (diff) | |
| download | metacity-8fe344db5169af4a9e4dda2661046162350b7b1d.tar.gz | |
if theme is invalid and therefore got freed, don't attempt to read from
2007-04-05 Thomas Thurman <thomas@thurman.org.uk>
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/theme-parser.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2007-04-05 Thomas Thurman <thomas@thurman.org.uk> + + * 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 <hadess@hadess.net> * 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 <joss@malsain.org> * src/session.c (meta_session_init): if previous client ID diff --git a/src/theme-parser.c b/src/theme-parser.c index 68db8e79..ae11b838 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) { |