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

fix memory access in rc_setoption

This commit is contained in:
Enno Rehling 2017-11-20 08:24:56 +01:00
parent 923f01190c
commit 8a638859fd
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/economy.test.c
View File

@ -217,7 +217,7 @@ static unit *setup_trade_unit(CuTest *tc, region *r, const struct race *rc) {
} }
static void test_trade_insect(CuTest *tc) { static void test_trade_insect(CuTest *tc) {
/* Insekten können in Wüsten und Sümpfen auch ohne Burgen handeln. */ /* Insekten k<EFBFBD>nnen in W<>sten und S<>mpfen auch ohne Burgen handeln. */
unit *u; unit *u;
region *r; region *r;
const item_type *it_luxury; const item_type *it_luxury;
@ -239,6 +239,8 @@ static void test_trade_insect(CuTest *tc) {
LOC(u->faction->locale, resourcename(it_luxury->rtype, 0)))); LOC(u->faction->locale, resourcename(it_luxury->rtype, 0))));
set_item(u, it_silver, 10); set_item(u, it_silver, 10);
CuAssertPtrEquals(tc, r, u->region);
CuAssertPtrEquals(tc, (void *)it_luxury, (void *)r_luxury(u->region));
produce(u->region); produce(u->region);
CuAssertIntEquals(tc, 1, get_item(u, it_luxury)); CuAssertIntEquals(tc, 1, get_item(u, it_luxury));
CuAssertIntEquals(tc, 5, get_item(u, it_silver)); CuAssertIntEquals(tc, 5, get_item(u, it_silver));

11
src/kernel/race.c
View File

@ -106,18 +106,19 @@ static void rc_setoption(race *rc, int k, const char *value) {
rc->options->key[1] = RCO_NONE; rc->options->key[1] = RCO_NONE;
v = rc->options->value; v = rc->options->value;
} else { } else {
for (i=0;!v && i < MAXOPTIONS && rc->options->key[i]!=RCO_NONE;++i) { for (i=0;!v && i < MAXOPTIONS;++i) {
if (rc->options->key[i]==key) { if (rc->options->key[i]==key) {
v = rc->options->value+i; v = rc->options->value+i;
break;
} }
} if (rc->options->key[i]==RCO_NONE) {
if (!v) {
assert(i<MAXOPTIONS || !"MAXOPTIONS too small for race");
v = rc->options->value+i; v = rc->options->value+i;
rc->options->key[i] = key; rc->options->key[i] = key;
if (i+1<MAXOPTIONS) { if (i+1 < MAXOPTIONS) {
rc->options->key[i+1]=RCO_NONE; rc->options->key[i+1]=RCO_NONE;
} }
break;
}
} }
} }
assert(v); assert(v);