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

re-enable a test that supposedly breaks on travis (find out why)

Browse source 
fix a potential null-pointer crash in rename_cmd
This commit is contained in:
Enno Rehling 2015-10-13 13:32:27 +02:00
parent 7e2364c296
commit 177f8f5288
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/laws.c
View file

@ -1622,7 +1622,7 @@ bool renamed_building(const building * b)
static int rename_cmd(unit * u, order * ord, char **s, const char *s2) static int rename_cmd(unit * u, order * ord, char **s, const char *s2)
{ {
if (!s2[0]) { if (!s2 || !s2[0]) {
cmistake(u, ord, 84, MSG_EVENT); cmistake(u, ord, 84, MSG_EVENT);
return 0; return 0;
} }

2
src/laws.test.c
View file

@ -1135,7 +1135,7 @@ CuSuite *get_laws_suite(void)
SUITE_ADD_TEST(suite, test_mail_faction_no_msg); SUITE_ADD_TEST(suite, test_mail_faction_no_msg);
SUITE_ADD_TEST(suite, test_mail_region_no_msg); SUITE_ADD_TEST(suite, test_mail_region_no_msg);
SUITE_ADD_TEST(suite, test_mail_faction_no_target); SUITE_ADD_TEST(suite, test_mail_faction_no_target);
(void)test_luck_message; /* disabled, breaks on travis */ SUITE_ADD_TEST(suite, test_luck_message);
return suite; return suite;
} }