luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-20 04:22:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Order refs/unrefs so setting the same object back is safe. (#112861,

Browse Source 
Fri May 30 14:42:24 2003  Owen Taylor  <otaylor@redhat.com>

        * gobject.c (g_value_set_object): Order refs/unrefs
        so setting the same object back is safe. (#112861,
        Morten Welinder)
This commit is contained in:
Owen Taylor 2003-05-30 18:44:57 +00:00 committed by Owen Taylor
parent 614e5ed63a
commit 68e49c7811
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/ChangeLog
View File

@ -1,3 +1,9 @@
Fri May 30 14:42:24 2003 Owen Taylor <otaylor@redhat.com>
* gobject.c (g_value_set_object): Order refs/unrefs
so setting the same object back is safe. (#112861,
Morten Welinder)
2003-03-24 Sven Neumann <sven@gimp.org> 2003-03-24 Sven Neumann <sven@gimp.org>
* gtype.c (type_data_finalize_class_ifaces_Wm): removed leftover * gtype.c (type_data_finalize_class_ifaces_Wm): removed leftover

15
gobject/gobject.c
View File

@ -1508,14 +1508,12 @@ void
g_value_set_object (GValue *value, g_value_set_object (GValue *value,
gpointer v_object) gpointer v_object)
{ {
GObject *old;
g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); g_return_if_fail (G_VALUE_HOLDS_OBJECT (value));
if (value->data[0].v_pointer)
{
g_object_unref (value->data[0].v_pointer);
value->data[0].v_pointer = NULL;
}
old = value->data[0].v_pointer;
if (v_object) if (v_object)
{ {
g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (G_IS_OBJECT (v_object));
@ -1524,6 +1522,11 @@ g_value_set_object (GValue *value,
value->data[0].v_pointer = v_object; value->data[0].v_pointer = v_object;
g_object_ref (value->data[0].v_pointer); g_object_ref (value->data[0].v_pointer);
} }
else
value->data[0].v_pointer = NULL;
if (old)
g_object_unref (old);
} }
void void