luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 13:23:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle a corner-case of notify avoidance

Browse Source 
The corner-case we are handling here is that
we don't freeze the notify queue in g_object_init
(because there's no custom ->notify vfunc, but
then we gain a notify handler during instance
init, and instance init also triggers a
notification. Handle this by jit freezing
notification in g_object_notify_by_spec_internal.

Note that this is bad code - instance init really
shouldn't be doing things like this.

Testcase included.

Fixes: #2665
This commit is contained in:
Matthias Clasen 2022-06-08 14:06:40 -04:00
parent 9444ace2c8
commit 58ab960a87
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gobject/gobject.c
View File

@ -1441,24 +1441,51 @@ static inline void
g_object_notify_by_spec_internal (GObject *object, g_object_notify_by_spec_internal (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
#ifdef HAVE_OPTIONAL_FLAGS
guint object_flags;
#endif
gboolean has_notify;
gboolean in_init;
if (G_UNLIKELY (~pspec->flags & G_PARAM_READABLE)) if (G_UNLIKELY (~pspec->flags & G_PARAM_READABLE))
return; return;
param_spec_follow_override (&pspec); param_spec_follow_override (&pspec);
if (pspec != NULL && #ifdef HAVE_OPTIONAL_FLAGS
_g_object_has_notify_handler (object)) /* get all flags we need with a single atomic read */
object_flags = object_get_optional_flags (object);
has_notify = ((object_flags & OPTIONAL_FLAG_HAS_NOTIFY_HANDLER) != 0) ||
CLASS_HAS_NOTIFY (G_OBJECT_GET_CLASS (object));
in_init = (object_flags & OPTIONAL_FLAG_IN_CONSTRUCTION) != 0;
#else
has_notify = TRUE;
in_init = object_in_construction (object);
#endif
if (pspec != NULL && has_notify)
{ {
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
gboolean need_thaw = TRUE;
/* conditional freeze: only increase freeze count if already frozen */ /* conditional freeze: only increase freeze count if already frozen */
nqueue = g_object_notify_queue_freeze (object, TRUE); nqueue = g_object_notify_queue_freeze (object, TRUE);
if (in_init && !nqueue)
{
/* We did not freeze the queue in g_object_init, but
* we gained a notify handler in instance init, so
* now we need to freeze just-in-time
*/
nqueue = g_object_notify_queue_freeze (object, FALSE);
need_thaw = FALSE;
}
if (nqueue != NULL) if (nqueue != NULL)
{ {
/* we're frozen, so add to the queue and release our freeze */ /* we're frozen, so add to the queue and release our freeze */
g_object_notify_queue_add (object, nqueue, pspec); g_object_notify_queue_add (object, nqueue, pspec);
g_object_notify_queue_thaw (object, nqueue); if (need_thaw)
g_object_notify_queue_thaw (object, nqueue);
} }
else else
{ {
@ -2167,11 +2194,12 @@ g_object_new_internal (GObjectClass *class,
{ {
GSList *node; GSList *node;
if (CLASS_HAS_NOTIFY (class)) if (_g_object_has_notify_handler (object))
{ {
/* This will have been setup in g_object_init() */ /* This will have been setup in g_object_init() */
nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue); nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
g_assert (nqueue != NULL); if (!nqueue)
nqueue = g_object_notify_queue_freeze (object, FALSE);
} }
/* We will set exactly n_construct_properties construct /* We will set exactly n_construct_properties construct