mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 11:32:04 +00:00
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
This commit is contained in:
parent
f32712937b
commit
8fe344db51
@ -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
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user