qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build the field types array for enums, too.

Browse source 
However, every element is the same: type_default's type_def. This fixes the
segfault building qwaq introduced by the previous enum commit.
This commit is contained in:
Bill Currie 2013-01-17 22:01:31 +09:00
parent 46d2959908
commit eacc59c016
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/qfcc/source/obj_type.c
View file

@ -167,7 +167,7 @@ qfo_encode_struct (type_t *type)
qfot_type_t *enc; qfot_type_t *enc;
qfot_struct_t *strct; qfot_struct_t *strct;
def_t *def; def_t *def;
def_t **field_types = &def; def_t **field_types;
int i; int i;
int size; int size;
int offset; int offset;
@ -194,16 +194,18 @@ qfo_encode_struct (type_t *type)
type->type_def = def; // avoid infinite recursion type->type_def = def; // avoid infinite recursion
if (type->meta != ty_enum) {
field_types = alloca (num_fields * sizeof (def_t *)); field_types = alloca (num_fields * sizeof (def_t *));
for (i = 0, sym = type->t.symtab->symbols; sym; sym = sym->next) { for (i = 0, sym = type->t.symtab->symbols; sym; sym = sym->next) {
if (sym->sy_type != sy) if (sym->sy_type != sy)
continue; continue;
if (i == num_fields) if (i == num_fields)
internal_error (0, "whoa, what happened?"); internal_error (0, "whoa, what happened?");
if (type->meta != ty_enum) {
field_types[i] = qfo_encode_type (sym->type); field_types[i] = qfo_encode_type (sym->type);
i++; } else {
field_types[i] = type_default->type_def;
} }
i++;
} }
for (i = 0, sym = type->t.symtab->symbols; sym; sym = sym->next) { for (i = 0, sym = type->t.symtab->symbols; sym; sym = sym->next) {