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

check and fix destroy_cmd syntax error handling

This commit is contained in:
Enno Rehling 2016-08-31 20:38:20 +02:00
parent 3c1704e691
commit b321918cd1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/build.c
View File

@ -175,7 +175,7 @@ int destroy_cmd(unit * u, struct order *ord)
} }
} }
if (isparam(s, u->faction->locale, P_ROAD)) { if (s && isparam(s, u->faction->locale, P_ROAD)) {
destroy_road(u, n, ord); destroy_road(u, n, ord);
return 0; return 0;
} }

13
src/kernel/build.test.c
View File

@ -382,6 +382,18 @@ static void test_build_destroy_road_limit(CuTest *tc)
test_cleanup(); test_cleanup();
} }
static void test_build_destroy_cmd(CuTest *tc) {
unit *u;
faction *f;
test_setup();
u = test_create_unit(f = test_create_faction(0), test_create_region(0, 0, 0));
u->thisorder = create_order(K_DESTROY, f->locale, NULL);
CuAssertIntEquals(tc, 138, destroy_cmd(u, u->thisorder));
CuAssertPtrNotNull(tc, test_find_messagetype(f->msgs, "error138"));
test_cleanup();
}
CuSuite *get_build_suite(void) CuSuite *get_build_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
@ -396,6 +408,7 @@ CuSuite *get_build_suite(void)
SUITE_ADD_TEST(suite, test_build_building_success); SUITE_ADD_TEST(suite, test_build_building_success);
SUITE_ADD_TEST(suite, test_build_building_with_golem); SUITE_ADD_TEST(suite, test_build_building_with_golem);
SUITE_ADD_TEST(suite, test_build_building_no_materials); SUITE_ADD_TEST(suite, test_build_building_no_materials);
SUITE_ADD_TEST(suite, test_build_destroy_cmd);
SUITE_ADD_TEST(suite, test_build_destroy_road); SUITE_ADD_TEST(suite, test_build_destroy_road);
SUITE_ADD_TEST(suite, test_build_destroy_road_limit); SUITE_ADD_TEST(suite, test_build_destroy_road_limit);
SUITE_ADD_TEST(suite, test_build_destroy_road_guard); SUITE_ADD_TEST(suite, test_build_destroy_road_guard);