Merge branch '2672-accel-group-crash' into 'main'

gobject: Fix crash when disposing a GtkAccelGroup

See merge request GNOME/glib!2756
This commit is contained in:
Emmanuele Bassi 2022-06-21 12:03:02 +00:00
commit be7d824053

View File

@ -1360,7 +1360,10 @@ g_object_real_dispose (GObject *object)
}; };
g_signal_handlers_destroy (object); g_signal_handlers_destroy (object);
g_datalist_id_remove_multiple (&object->qdata, keys, G_N_ELEMENTS (keys)); /* FIXME: This should be simplified down to a single remove_multiple() call.
* See https://gitlab.gnome.org/GNOME/glib/-/issues/2672 */
g_datalist_id_remove_multiple (&object->qdata, keys, 1);
g_datalist_id_remove_multiple (&object->qdata, keys + 1, 2);
} }
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG