Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into...

[qemu.git] / thunk.c

diff --git a/thunk.c b/thunk.c
index 2dac36666de47c74477dc42ff897497e1440fc5a..d5d8645cd4f12c5501d7d4632f85bbe97a017d8c 100644 (file)
--- a/thunk.c
+++ b/thunk.c
@@ -67,7 +67,6 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
     int nb_fields, offset, max_align, align, size, i, j;
 
     assert(id < max_struct_entries);
-    se = struct_entries + id;
 
     /* first we count the number of fields */
     type_ptr = types;
@@ -76,6 +75,8 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
         type_ptr = thunk_type_next(type_ptr);
         nb_fields++;
     }
+    assert(nb_fields > 0);
+    se = struct_entries + id;
     se->field_types = types;
     se->nb_fields = nb_fields;
     se->name = name;