bugfix crash vergesse.

Author: ennorehling

src/economy.c

@@ -286,6 +286,9 @@ int forget_cmd(unit * u, order * ord)
         ADDMSG(&u->faction->msgs, msg_message("forget", "unit skill", u, sk));
         set_level(u, sk, 0);
     }
+    else {
+        cmistake(u, ord, 77, MSG_EVENT);
+    }
     return 0;
 }
 

src/economy.test.c

@@ -879,6 +879,19 @@ static void test_forget_cmd(CuTest *tc) {
     test_teardown();
 }
 
+static void test_forget_cmd_unknown_skill(CuTest *tc) {
+    unit *u;
+
+    test_setup();
+    u = test_create_unit(test_create_faction(), test_create_plain(0, 0));
+    test_set_skill(u, SK_CATAPULT, 3, 4);
+    u->thisorder = create_order(K_FORGET, u->faction->locale, "hurrdurr");
+    forget_cmd(u, u->thisorder);
+    CuAssertPtrNotNull(tc, test_find_messagetype(u->faction->msgs, "error77"));
+    CuAssertPtrNotNull(tc, u->skills);
+    test_teardown();
+}
+
 static void test_buy_cmd(CuTest *tc) {
     region * r;
     unit *u;
@@ -1772,6 +1785,7 @@ CuSuite *get_economy_suite(void)
     SUITE_ADD_TEST(suite, test_tax_cmd);
     SUITE_ADD_TEST(suite, test_trade_is_long_action);
     SUITE_ADD_TEST(suite, test_forget_cmd);
+    SUITE_ADD_TEST(suite, test_forget_cmd_unknown_skill);
     SUITE_ADD_TEST(suite, test_buy_cmd);
     SUITE_ADD_TEST(suite, test_buy_twice);
     SUITE_ADD_TEST(suite, test_buy_prices);

src/kernel/order.c

@@ -266,7 +266,7 @@ static int create_data(keyword_t kwd, const char *s,
     if (kwd == K_STUDY || kwd == K_AUTOSTUDY || kwd == K_FORGET) {
         const char * sptr = s;
         skill_t sk = findskill(parse_token_depr(&sptr), lang);
-        if (kwd == K_FORGET || (sk != SK_MAGIC && sk != NOSKILL)) {
+        if (sk != SK_MAGIC && sk != NOSKILL) {
             return ((int)sk)-100;
         }
     }
@@ -597,7 +597,7 @@ keyword_t init_order(const struct order *ord, const struct locale *lang)
             assert(sk < MAXSKILLS);
             assert(lang);
             str = skillname(sk, lang);
-            if (strchr(str, ' ') == NULL) {
+            if (!str || strchr(str, ' ') == NULL) {
                 init_tokens_str(str);
             }
             else {

src/kernel/order.test.c

@@ -3,6 +3,7 @@
 #include "eressea.h"
 
 #include "skill.h"
+#include "faction.h"
 #include "unit.h"
 
 #include <util/keyword.h>   // for keyword, K_STUDY, K_MOVE, init_keywords
@@ -547,6 +548,18 @@ static void test_study_order_quoted(CuTest *tc) {
     test_teardown();
 }
 
+static void test_forget_order_bad_skill(CuTest *tc) {
+    test_setup();
+    unit *u;
+    u = test_create_unit(test_create_faction(), test_create_plain(0, 0));
+
+    u->thisorder = create_order(K_FORGET, u->faction->locale, "hurrdurr");
+    CuAssertIntEquals(tc, K_FORGET, init_order(u->thisorder, u->faction->locale));
+    CuAssertStrEquals(tc, "hurrdurr", getstrtoken());
+
+    test_teardown();
+}
+
 static void test_study_order_unknown_tilde(CuTest *tc) {
     char token[32];
     stream out;
@@ -666,6 +679,7 @@ CuSuite *get_order_suite(void)
     SUITE_ADD_TEST(suite, test_study_order_unknown_tilde);
     SUITE_ADD_TEST(suite, test_study_order_unknown_quoted);
     SUITE_ADD_TEST(suite, test_study_order_quoted);
+    SUITE_ADD_TEST(suite, test_forget_order_bad_skill);
     SUITE_ADD_TEST(suite, test_parse_order);
     SUITE_ADD_TEST(suite, test_parse_parameters);
     SUITE_ADD_TEST(suite, test_parse_make);