qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-05 23:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the source of bogus string relocs.

Browse source 
Nested aggregate initializers were corrupting themselves.
This commit is contained in:
Bill Currie 2011-03-05 09:21:12 +09:00
parent 7c95913c61
commit cfefd79e07
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/qfcc/source/def.c
View file

@ -248,6 +248,7 @@ init_elements (struct def_s *def, expr_t *eles)
continue; continue;
} }
init_elements (&elements[i], c); init_elements (&elements[i], c);
continue;
} else if (c->type == ex_value) { } else if (c->type == ex_value) {
if (c->e.value.type == ev_integer if (c->e.value.type == ev_integer
&& elements[i].type->type == ev_float) && elements[i].type->type == ev_float)
@ -269,6 +270,8 @@ init_elements (struct def_s *def, expr_t *eles)
append_expr (local_expr, assign_expr (unary_expr ('.', ptr), c)); append_expr (local_expr, assign_expr (unary_expr ('.', ptr), c));
} else { } else {
if (c->type != ex_value)
internal_error (c, "bogus expression type in init_elements()");
if (c->e.value.type == ev_string) { if (c->e.value.type == ev_string) {
EMIT_STRING (def->space, g->string_var, EMIT_STRING (def->space, g->string_var,
c->e.value.v.string_val); c->e.value.v.string_val);