luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-18 19:51:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashes in new constructor and properties code

Browse Source 
2008-03-11  Alexander Larsson  <alexl@redhat.com>

        * gthemedicon.c:
	Fix crashes in new constructor and properties code


svn path=/trunk/; revision=6666
This commit is contained in:
Alexander Larsson 2008-03-11 00:14:11 +00:00 committed by Alexander Larsson
parent fadb7990f2
commit fd2e57c644
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-11 Alexander Larsson <alexl@redhat.com>
* gthemedicon.c:
Fix crashes in new constructor and properties code
2008-03-10 Murray Cumming <murrayc@murrayc.com> 2008-03-10 Murray Cumming <murrayc@murrayc.com>
* gfile.c: Minor spelling correction in documentation: * gfile.c: Minor spelling correction in documentation:

22
gio/gthemedicon.c
View File

@ -97,21 +97,35 @@ g_themed_icon_set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GThemedIcon *icon = G_THEMED_ICON (object); GThemedIcon *icon = G_THEMED_ICON (object);
gchar **names;
const gchar *name;
switch (prop_id) switch (prop_id)
{ {
case PROP_NAME: case PROP_NAME:
name = g_value_get_string (value);
if (!name)
break;
if (icon->names) if (icon->names)
g_strfreev (icon->names); g_strfreev (icon->names);
icon->names = g_new (char *, 2); icon->names = g_new (char *, 2);
icon->names[0] = g_value_dup_string (value); icon->names[0] = g_strdup (name);
icon->names[1] = NULL; icon->names[1] = NULL;
break; break;
case PROP_NAMES: case PROP_NAMES:
names = g_value_dup_boxed (value);
if (!names)
break;
if (icon->names) if (icon->names)
g_strfreev (icon->names); g_strfreev (icon->names);
icon->names = g_value_dup_boxed (value);
icon->names = names;
break; break;
case PROP_USE_DEFAULT_FALLBACKS: case PROP_USE_DEFAULT_FALLBACKS:
@ -187,7 +201,7 @@ g_themed_icon_class_init (GThemedIconClass *klass)
* *
* The icon name. * The icon name.
*/ */
g_object_class_install_property (gobject_class, PROP_NAMES, g_object_class_install_property (gobject_class, PROP_NAME,
g_param_spec_string ("name", g_param_spec_string ("name",
_("name"), _("name"),
_("The name of the icon"), _("The name of the icon"),
@ -278,7 +292,7 @@ g_themed_icon_new_from_names (char **iconnames,
char **names; char **names;
int i; int i;
names = g_malloc (len + 1); names = g_new (char *, len + 1);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
names[i] = iconnames[i]; names[i] = iconnames[i];