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

Rework transfer_type to avoid infinite recursion.

Browse source 
This is similar to the problem with infinite recursion when encoding types.
The problem is with structs with self-referential pointers (eg, struct foo
{struct foo *bar}). The solution is to copy the type data to a buffer and
mark the buffer as transfered before actually processing the type. Further
processing of the type is done via the buffer.
This commit is contained in:
Bill Currie 2012-11-11 20:20:07 +09:00
parent edd381931e
commit 8710977323
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/qfcc/source/linker.c
View file

@ -470,13 +470,24 @@ add_space (qfo_t *qfo, qfo_mspace_t *space)
static pointer_t
transfer_type (qfo_t *qfo, qfo_mspace_t *space, pointer_t type_offset)
{
qfot_type_t *type_buffer;
qfot_type_t *type;
int i;
int type_size;
const char *str;
type = (qfot_type_t *) (char *) &space->d.data[type_offset];
if (type->ty < 0)
return type->t.class;
type_size = type->size * sizeof (pr_type_t);
type_buffer = alloca (type_size);
memcpy (type_buffer, type, type_size);
type_offset = defspace_alloc_loc (work_type_data, type->size);
type->t.class = type_offset;
type->ty = -1;
type = type_buffer;
type->encoding = linker_add_string (QFOSTR (qfo, type->encoding));
switch ((ty_meta_e) type->ty) {
case ty_none:
@ -515,11 +526,7 @@ transfer_type (qfo_t *qfo, qfo_mspace_t *space, pointer_t type_offset)
//FIXME this is broken
break;
}
type_offset = defspace_alloc_loc (work_type_data, type->size);
memcpy (work_type_data->data + type_offset, type,
type->size * sizeof (pr_type_t));
type->ty = -1;
type->t.class = type_offset;
memcpy (work_type_data->data + type_offset, type, type_size);
return type_offset;
}