mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qom: Detect bad reentrance during object_class_foreach()

Browse Source 
We should not modify the type hash table while it is being iterated on.
Assert that it does not happen.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hervé Poussineau 2013-12-03 16:42:00 +01:00 committed by Andreas Färber
parent 14389dbd02
commit f54c19cacb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qom/object.c
View File

@ -78,8 +78,11 @@ static GHashTable *type_table_get(void)
return type_table; return type_table;
} }
static bool enumerating_types;
static void type_table_add(TypeImpl *ti) static void type_table_add(TypeImpl *ti)
{ {
assert(!enumerating_types);
g_hash_table_insert(type_table_get(), (void *)ti->name, ti); g_hash_table_insert(type_table_get(), (void *)ti->name, ti);
} }
@ -670,7 +673,9 @@ void object_class_foreach(void (*fn)(ObjectClass *klass, void *opaque),
{ {
OCFData data = { fn, implements_type, include_abstract, opaque }; OCFData data = { fn, implements_type, include_abstract, opaque };
enumerating_types = true;
g_hash_table_foreach(type_table_get(), object_class_foreach_tramp, &data); g_hash_table_foreach(type_table_get(), object_class_foreach_tramp, &data);
enumerating_types = false;
} }
int object_child_foreach(Object *obj, int (*fn)(Object *child, void *opaque), int object_child_foreach(Object *obj, int (*fn)(Object *child, void *opaque),