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

don't seg when constants are involved in && or || expressions

Browse source
This commit is contained in:
Bill Currie 2004-02-09 02:23:37 +00:00
parent 499dac6bb1
commit 1181fb267b
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1065,6 +1065,14 @@ merge (ex_list_t *l1, ex_list_t *l2)
{ {
ex_list_t *m; ex_list_t *m;
if (!l1 && !l2) {
error (0, "internal error");
abort ();
}
if (!l2)
return l1;
if (!l1)
return l2;
m = malloc ((size_t)&((ex_list_t *)0)->e[l1->size + l2->size]); m = malloc ((size_t)&((ex_list_t *)0)->e[l1->size + l2->size]);
m->size = l1->size + l2->size; m->size = l1->size + l2->size;
memcpy (m->e, l1->e, l1->size * sizeof (expr_t *)); memcpy (m->e, l1->e, l1->size * sizeof (expr_t *));