brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if theme is invalid and therefore got freed, don't attempt to read from

Browse Source 
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:
Thomas Thurman 2007-04-05 18:45:03 +00:00 committed by Thomas James Alexander Thurman
parent f32712937b
commit 8fe344db51
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2007-04-05 Bastien Nocera <hadess@hadess.net>
* src/50-metacity-desktop-key.xml.in: * src/50-metacity-desktop-key.xml.in:
@ -202,6 +207,7 @@
* src/window.c (meta_window_new_with_attrs): * src/window.c (meta_window_new_with_attrs):
new hooks to handle new atom new hooks to handle new atom
>>>>>>> .r3171
2007-03-26 Josselin Mouette <joss@malsain.org> 2007-03-26 Josselin Mouette <joss@malsain.org>
* src/session.c (meta_session_init): if previous client ID * src/session.c (meta_session_init): if previous client ID

3
src/theme-parser.c
View File

@ -4610,7 +4610,8 @@ meta_theme_load (const char *theme_name,
g_markup_parse_context_free (context); g_markup_parse_context_free (context);
g_free (text); g_free (text);
info.theme->format_version = info.format_version; if (info.theme)
info.theme->format_version = info.format_version;
if (error) if (error)
{ {