Fix thread-safety

The n_children variable can be written when locked, while the n_supers
variable is read at any time. As they both share the same bytes,
accessing them is not threadsafe.
This patch puts them into different bytes.

Thanks to Xan Lopez and valgrind for noticing this.

diff --git a/gobject/gtype.c b/gobject/gtype.c
index d5822422e235ca6c076a0a3b54d59e671a3c2e89..d2bca5535f07119261bb8d4d34dbd8efb25e87bb 100644 (file)
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -223,13 +223,13 @@ typedef enum
 struct _TypeNode
 {
   GTypePlugin *plugin;
-  guint        n_children : 12;
+  guint        n_children; /* writable with lock */
   guint        n_supers : 8;
   guint        _prot_n_ifaces_prerequisites : 9;
   guint        is_classed : 1;
   guint        is_instantiatable : 1;
   guint        mutatable_check_cache : 1;      /* combines some common path checks */
-  GType       *children;
+  GType       *children; /* writable with lock */
   TypeData * volatile data;
   GQuark       qname;
   GData       *global_gdata;