mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-27 07:56:14 +01:00
gobject: Handle ref_count==0 in notify_by_pspec
Just like g_object_notify, check for a zero ref_count in g_object_notify_by_pspec and leave if it is 0. This allows using functions in ->finalize() that possibly also notify a property change on the object. Previously, this resulted in an error from g_object_ref. https://bugzilla.gnome.org/show_bug.cgi?id=705570
This commit is contained in:
parent
62f173f1f3
commit
4b334ef8f1
@ -1238,6 +1238,9 @@ g_object_notify_by_pspec (GObject *object,
|
|||||||
g_return_if_fail (G_IS_OBJECT (object));
|
g_return_if_fail (G_IS_OBJECT (object));
|
||||||
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
|
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
|
||||||
|
|
||||||
|
if (g_atomic_int_get (&object->ref_count) == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
g_object_ref (object);
|
g_object_ref (object);
|
||||||
g_object_notify_by_spec_internal (object, pspec);
|
g_object_notify_by_spec_internal (object, pspec);
|
||||||
g_object_unref (object);
|
g_object_unref (object);
|
||||||
|
@ -67,6 +67,13 @@ test_object_finalize (GObject *gobject)
|
|||||||
{
|
{
|
||||||
g_free (((TestObject *) gobject)->baz);
|
g_free (((TestObject *) gobject)->baz);
|
||||||
|
|
||||||
|
/* When the ref_count of an object is zero it is still
|
||||||
|
* possible to notify the property, but it should do
|
||||||
|
* nothing and silenty quit (bug #705570)
|
||||||
|
*/
|
||||||
|
g_object_notify (gobject, "foo");
|
||||||
|
g_object_notify_by_pspec (gobject, properties[PROP_BAR]);
|
||||||
|
|
||||||
G_OBJECT_CLASS (test_object_parent_class)->finalize (gobject);
|
G_OBJECT_CLASS (test_object_parent_class)->finalize (gobject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user