applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't crash if the color string is mangled, and close a small memory leak

Browse source 
2007-04-03  Jens Granseuer  <jensgr@gmx.net>

	* gnome-theme-details.c: (update_color_buttons_from_string):
	don't crash if the color string is mangled, and close a small
	memory leak

svn path=/trunk/; revision=7439
This commit is contained in:
Jens Granseuer 2007-04-03 21:05:11 +00:00 • committed by Jens Granseuer
parent 66283c87ed
commit 7eeb3afb39
2 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
capplets/theme-switcher/gnome-theme-details.c
View file

@ -902,25 +902,24 @@ update_color_buttons_from_string (gchar *color_scheme)
{
color_scheme_pair = g_strsplit (current_string, ":", 0);
if (color_scheme_pair[0] == NULL)
continue;
if (color_scheme_pair[0] != NULL && color_scheme_pair[1] != NULL)
{
g_strstrip (color_scheme_pair[0]);
g_strstrip (color_scheme_pair[1]);
g_strstrip (color_scheme_pair[0]);
g_strstrip (color_scheme_pair[1]);
if (!strcmp ("fg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[0]);
else if (!strcmp ("bg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[1]);
else if (!strcmp ("text_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[2]);
else if (!strcmp ("base_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[3]);
else if (!strcmp ("selected_fg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[4]);
else if (!strcmp ("selected_bg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[5]);
if (!strcmp ("fg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[0]);
else if (!strcmp ("bg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[1]);
else if (!strcmp ("text_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[2]);
else if (!strcmp ("base_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[3]);
else if (!strcmp ("selected_fg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[4]);
else if (!strcmp ("selected_bg_color", color_scheme_pair[0]))
gdk_color_parse (color_scheme_pair[1], &color_scheme_colors[5]);
}
g_strfreev (color_scheme_pair);
}