empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

budget: Oops on use of invalid bp map entries

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-07-17 08:12:56 +02:00
parent 5b0fd1171d
commit 7814d3865d
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/lib/update/bp.c
View file

@ -57,6 +57,7 @@ enum bp_item_idx {
struct bp { struct bp {
short bp_item[BP_MAX + 1]; short bp_item[BP_MAX + 1];
short bp_avail; short bp_avail;
unsigned char bp_tracked;
}; };
/* Map i_type to enum bp_item_idx. */ /* Map i_type to enum bp_item_idx. */
@ -81,15 +82,22 @@ bp_set_from_sect(struct bp *bp, struct sctstr *sp)
bp[sp->sct_uid].bp_item[idx] = sp->sct_item[i]; bp[sp->sct_uid].bp_item[idx] = sp->sct_item[i];
} }
bp[sp->sct_uid].bp_avail = sp->sct_avail; bp[sp->sct_uid].bp_avail = sp->sct_avail;
bp[sp->sct_uid].bp_tracked = 1;
} }
/* Copy the values tracked in @bp for sector @sp back to @sp. */ /*
* Copy the values tracked in @bp for sector @sp back to @sp.
* Values must have been set with bp_set_from_sect().
*/
void void
bp_to_sect(struct bp *bp, struct sctstr *sp) bp_to_sect(struct bp *bp, struct sctstr *sp)
{ {
i_type i; i_type i;
enum bp_item_idx idx; enum bp_item_idx idx;
if (CANT_HAPPEN(!bp[sp->sct_uid].bp_tracked))
return;
for (i = I_NONE + 1; i <= I_MAX; i++) { for (i = I_NONE + 1; i <= I_MAX; i++) {
idx = bud_key[i]; idx = bud_key[i];
if (idx >= 0) if (idx >= 0)
@ -105,5 +113,11 @@ bp_to_sect(struct bp *bp, struct sctstr *sp)
struct bp * struct bp *
bp_alloc(void) bp_alloc(void)
{ {
return malloc(WORLD_SZ() * sizeof(struct bp)); int n = WORLD_SZ();
struct bp *bp = malloc(n * sizeof(*bp));
int i;
for (i = 0; i < n; i++)
bp[i].bp_tracked = 0;
return bp;
} }