darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-17 17:11:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking

Browse source
This commit is contained in:
Dale Weiler 2013-08-27 04:28:11 -04:00
commit 1b3d515777
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ast.c
View file

@ -1348,6 +1348,20 @@ static bool ast_global_array_set(ast_value *self)
return true; return true;
} }
static bool check_array(ast_value *self, ast_value *array)
{
if (array->expression.flags & AST_FLAG_ARRAY_INIT && !array->initlist) {
compile_error(ast_ctx(self), "array without size: %s", self->name);
return false;
}
/* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */
if (!array->expression.count || array->expression.count > OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE)) {
compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)array->expression.count);
return false;
}
return true;
}
bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield) bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
{ {
ir_value *v = NULL; ir_value *v = NULL;
@ -1395,9 +1409,8 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
return false; return false;
} }
/* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */ if (!check_array(self, array))
if (!array->expression.count || array->expression.count > OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE)) return false;
compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)array->expression.count);
elemtype = array->expression.next; elemtype = array->expression.next;
vtype = elemtype->vtype; vtype = elemtype->vtype;
@ -1463,8 +1476,8 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
} }
/* same as with field arrays */ /* same as with field arrays */
if (!self->expression.count || self->expression.count > OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE)) if (!check_array(self, self))
compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)self->expression.count); return false;
v = ir_builder_create_global(ir, self->name, vtype); v = ir_builder_create_global(ir, self->name, vtype);
if (!v) { if (!v) {
@ -1601,9 +1614,8 @@ static bool ast_local_codegen(ast_value *self, ir_function *func, bool param)
} }
/* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */ /* we are lame now - considering the way QC works we won't tolerate arrays > 1024 elements */
if (!self->expression.count || self->expression.count > OPTS_OPTION_U32(OPTION_MAX_ARRAY_SIZE)) { if (!check_array(self, self))
compile_error(ast_ctx(self), "Invalid array of size %lu", (unsigned long)self->expression.count); return false;
}
self->ir_values = (ir_value**)mem_a(sizeof(self->ir_values[0]) * self->expression.count); self->ir_values = (ir_value**)mem_a(sizeof(self->ir_values[0]) * self->expression.count);
if (!self->ir_values) { if (!self->ir_values) {