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

add a test for f_regionid, catch missing zero-termination

Browse source
This commit is contained in:
Enno Rehling 2012-05-28 23:31:46 -07:00
parent 7152ffd40f
commit 131efac393
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/kernel/reports.c
View file

@ -1858,8 +1858,9 @@ const char *trailinto(const region * r, const struct locale *lang)
size_t size_t
f_regionid(const region * r, const faction * f, char *buffer, size_t size) f_regionid(const region * r, const faction * f, char *buffer, size_t size)
{ {
size_t len;
if (!r) { if (!r) {
strncpy(buffer, "(Chaos)", size); len = strlcpy(buffer, "(Chaos)", size);
} else { } else {
plane *pl = rplane(r); plane *pl = rplane(r);
const char *name = pl ? pl->name : 0; const char *name = pl ? pl->name : 0;
@ -1867,12 +1868,12 @@ f_regionid(const region * r, const faction * f, char *buffer, size_t size)
int named = (name && name[0]); int named = (name && name[0]);
pnormalize(&nx, &ny, pl); pnormalize(&nx, &ny, pl);
adjust_coordinates(f, &nx, &ny, pl, r); adjust_coordinates(f, &nx, &ny, pl, r);
strncpy(buffer, rname(r, f->locale), size); len = strlcpy(buffer, rname(r, f?f->locale:0), size);
snprintf(buffer + len, size-len, " (%d,%d%s%s)", nx, ny, named ? "," : "", (named) ? name : "");
buffer[size-1] = 0; buffer[size-1] = 0;
sprintf(buffer + strlen(buffer), " (%d,%d%s%s)", nx, ny, named ? "," : "", len=strlen(buffer);
(named) ? name : "");
} }
return strlen(buffer); return len;
} }
static char *f_regionid_s(const region * r, const faction * f) static char *f_regionid_s(const region * r, const faction * f)

23
src/kernel/reports_test.c
View file

@ -52,9 +52,32 @@ static void test_reorder_units(CuTest * tc)
CuAssertPtrEquals(tc, 0, u0->next); CuAssertPtrEquals(tc, 0, u0->next);
} }
static void test_regionid(CuTest * tc) {
size_t len;
const struct terrain_type * plain;
struct region * r;
char buffer[64];
test_cleanup();
plain = test_create_terrain("plain", 0);
r = test_create_region(0, 0, plain);
memset(buffer, 0xff, sizeof(buffer));
len = f_regionid(r, 0, buffer, sizeof(buffer));
CuAssertIntEquals(tc, 11, len);
CuAssertStrEquals(tc, "plain (0,0)", buffer);
memset(buffer, -1, sizeof(buffer));
len = f_regionid(r, 0, buffer, 11);
CuAssertIntEquals(tc, 10, len);
CuAssertStrEquals(tc, "plain (0,0", buffer);
CuAssertIntEquals(tc, -1, buffer[11]);
}
CuSuite *get_reports_suite(void) CuSuite *get_reports_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_reorder_units); SUITE_ADD_TEST(suite, test_reorder_units);
SUITE_ADD_TEST(suite, test_regionid);
return suite; return suite;
} }