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

Force .param_N to be live when adding the edge to its node.

Browse source 
This fixes the segfault/null pointer access in sendv.r. While I wanted to
use the edge setting code to set the live bit, I didn't expect it to be
this easy. def_visit_all is proving to be worth every bit it consumes :)
This commit is contained in:
Bill Currie 2012-12-22 14:38:38 +09:00
parent 1fdc32bb39
commit 33bb422849
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/qfcc/source/dags.c
View file

@ -323,10 +323,13 @@ dagnode_set_edges_visit (def_t *def, void *_node)
}
static int
dag_find_node (def_t *def, void *unused)
dag_find_node (def_t *def, void *_daglabel)
{
if (def->daglabel && def->daglabel->dagnode)
daglabel_t **daglabel = (daglabel_t **) _daglabel;
if (def->daglabel && def->daglabel->dagnode) {
*daglabel = def->daglabel;
return def->daglabel->dagnode->number + 1; // ensure never 0
}
return 0;
}
@ -388,14 +391,17 @@ dagnode_set_edges (dag_t *dag, dagnode_t *n)
for (i = first_param; i < *num_params - '0'; i++) {
flowvar_t *var = flowvars[i + 1];
def_t *param_def = var->op->o.def;
daglabel_t *daglabel;
int param_node;
// FIXME hopefully only the one alias :P
param_node = def_visit_all (param_def, 0, dag_find_node, 0);
param_node = def_visit_all (param_def, 0, dag_find_node,
&daglabel);
if (!param_node) {
bug (0, ".param_%d not set for %s", i, n->label->opcode);
continue;
}
daglabel->live = 1;
set_add (n->edges, param_node - 1);
}
}