Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

leak: in tests, when correct message_type doesn't exist, arguments should not leak

This commit is contained in:
Enno Rehling 2015-10-14 20:41:42 +02:00
parent 144aeb23ac
commit f740f2829a
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/build.c
View File

@ -627,19 +627,27 @@ message *msg_materials_required(unit * u, order * ord,
const construction * ctype, int multi)
{
int c;
message *msg;
/* something missing from the list of materials */
resource *reslist = NULL;
if (multi <= 0 || multi == INT_MAX)
multi = 1;
for (c = 0; ctype && ctype->materials[c].number; ++c) {
// TODO: lots of alloc/dealloc calls here (make var_copy_resources take an array)
resource *res = malloc(sizeof(resource));
res->number = multi * ctype->materials[c].number / ctype->reqsize;
res->type = ctype->materials[c].rtype;
res->next = reslist;
reslist = res;
}
return msg_feedback(u, ord, "build_required", "required", reslist);
msg = msg_feedback(u, ord, "build_required", "required", reslist);
while (reslist) {
resource *res = reslist->next;
free(reslist);
reslist = res;
}
return msg;
}
int maxbuild(const unit * u, const construction * cons)

19
src/reports.c
View File

@ -1733,6 +1733,23 @@ static variant var_copy_items(variant x)
return x;
}
static variant var_copy_resources(variant x)
{
resource *rsrc;
resource *rdst = NULL, **rptr = &rdst;
for (rsrc = (resource *)x.v; rsrc != NULL; rsrc = rsrc->next) {
resource *res = malloc(sizeof(resource));
res->number = rsrc->number;
res->type = rsrc->type;
*rptr = res;
rptr = &res->next;
}
*rptr = NULL;
x.v = rdst;
return x;
}
static void var_free_resources(variant x)
{
resource *rsrc = (resource *)x.v;
@ -2295,7 +2312,7 @@ void register_reports(void)
register_argtype("int", NULL, NULL, VAR_INT);
register_argtype("string", var_free_string, var_copy_string, VAR_VOIDPTR);
register_argtype("order", var_free_order, var_copy_order, VAR_VOIDPTR);
register_argtype("resources", var_free_resources, NULL, VAR_VOIDPTR);
register_argtype("resources", var_free_resources, var_copy_resources, VAR_VOIDPTR);
register_argtype("items", var_free_resources, var_copy_items, VAR_VOIDPTR);
register_argtype("regions", var_free_regions, NULL, VAR_VOIDPTR);