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

fixed race condition where references to partially initialized classes

Browse Source 
* gtype.c (g_type_class_ref): fixed race condition where references to
        partially initialized classes could be handed out.

svn path=/branches/glib-2-16/; revision=7054
This commit is contained in:
Matthias Clasen
2008-06-17 02:58:11 +00:00
parent 698bee8aa5
commit 9aa9ad2989
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gobject/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-06-16 Matthias Clasen <mclasen@redhat.com>
Backport from trunk:
* gtype.c (g_type_class_ref): fixed race condition where references to
partially initialized classes could be handed out.
2008-04-08 Matthias Clasen <mclasen@redhat.com>
* === Released 2.16.3 ===

48
gobject/gtype.c
View File

@@ -2363,20 +2363,19 @@ gpointer
g_type_class_ref (GType type)
{
TypeNode *node;
/* optimize for common code path
*/
GType ptype;
/* optimize for common code path */
G_WRITE_LOCK (&type_rw_lock);
node = lookup_type_node_I (type);
if (node && node->is_classed && node->data &&
node->data->class.class && node->data->common.ref_count > 0)
node->data->class.class &&
node->data->class.init_state == INITIALIZED)
{
type_data_ref_Wm (node);
G_WRITE_UNLOCK (&type_rw_lock);
return node->data->class.class;
}
if (!node || !node->is_classed ||
(node->data && node->data->common.ref_count < 1))
{
@@ -2385,33 +2384,28 @@ g_type_class_ref (GType type)
type_descriptive_name_I (type));
return NULL;
}
type_data_ref_Wm (node);
ptype = NODE_PARENT_TYPE (node);
G_WRITE_UNLOCK (&type_rw_lock);
g_static_rec_mutex_lock (&class_init_rec_mutex); /* required locking order: 1) class_init_rec_mutex, 2) type_rw_lock */
/* here, we either have node->data->class.class == NULL, or a recursive
* call to g_type_class_ref() with a partly initialized class, or
* node->data->class.init_state == INITIALIZED, because any
* concurrently running initialization was guarded by class_init_rec_mutex.
*/
if (!node->data->class.class) /* class uninitialized */
{
GType ptype = NODE_PARENT_TYPE (node);
GTypeClass *pclass = NULL;
/* acquire reference on parent class */
GTypeClass *pclass = ptype ? g_type_class_ref (ptype) : NULL;
G_WRITE_LOCK (&type_rw_lock);
if (node->data->class.class) /* class was initialized during parent class initialization? */
INVALID_RECURSION ("g_type_plugin_*", node->plugin, NODE_NAME (node));
type_class_init_Wm (node, pclass);
G_WRITE_UNLOCK (&type_rw_lock);
g_static_rec_mutex_lock (&class_init_rec_mutex); /* required locking order: 1) class_init_rec_mutex, 2) type_rw_lock */
if (ptype)
{
pclass = g_type_class_ref (ptype);
G_WRITE_LOCK (&type_rw_lock);
node = lookup_type_node_I (type);
if (node->data->class.class)
INVALID_RECURSION ("g_type_plugin_*", node->plugin, NODE_NAME (node));
}
else
{
G_WRITE_LOCK (&type_rw_lock);
node = lookup_type_node_I (type);
}
if (!node->data->class.class) /* class could have been initialized meanwhile */
type_class_init_Wm (node, pclass);
G_WRITE_UNLOCK (&type_rw_lock);
g_static_rec_mutex_unlock (&class_init_rec_mutex);
}
g_static_rec_mutex_unlock (&class_init_rec_mutex);
return node->data->class.class;
}