qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build the field types array for enums, too. 

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

20
tools/qfcc/source/obj_type.c
View File

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