luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 12:53:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'object-refcount-checks' into 'main'

Browse Source 
gobject: Check for valid ref counting via g_return_if_fail

See merge request GNOME/glib!3106
This commit is contained in:
Philip Withnall 2022-12-06 09:04:03 +00:00
commit 720a1147a6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gobject/gobject.c
View File

@ -1468,9 +1468,7 @@ void
g_object_freeze_notify (GObject *object) g_object_freeze_notify (GObject *object)
{ {
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (g_atomic_int_get (&object->ref_count) > 0);
if (g_atomic_int_get (&object->ref_count) == 0)
return;
g_object_ref (object); g_object_ref (object);
g_object_notify_queue_freeze (object, FALSE); g_object_notify_queue_freeze (object, FALSE);
@ -1670,9 +1668,8 @@ g_object_thaw_notify (GObject *object)
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
if (g_atomic_int_get (&object->ref_count) == 0) g_return_if_fail (g_atomic_int_get (&object->ref_count) > 0);
return;
g_object_ref (object); g_object_ref (object);
/* FIXME: Freezing is the only way to get at the notify queue. /* FIXME: Freezing is the only way to get at the notify queue.