From 333c27403f9d82108ce76237dfa0679cc9a41644 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 13 Oct 2015 22:33:13 +0200 Subject: [PATCH] memory leaks: ship_type.construction, give_cmd return values --- src/give.test.c | 6 +++++- src/kernel/ship.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/give.test.c b/src/give.test.c index 18637f256..3e3b98a16 100644 --- a/src/give.test.c +++ b/src/give.test.c @@ -177,6 +177,7 @@ static void test_give_men_none(CuTest * tc) { CuAssertStrEquals(tc, "error96", test_get_messagetype(msg)); CuAssertIntEquals(tc, 1, env.dst->number); CuAssertIntEquals(tc, 1, env.src->number); + msg_release(msg); test_cleanup(); } @@ -193,6 +194,7 @@ static void test_give_men_other_faction(CuTest * tc) { CuAssertStrEquals(tc, "give_person", (const char *)msg->parameters[0].v); CuAssertIntEquals(tc, 2, env.dst->number); CuAssertIntEquals(tc, 0, env.src->number); + msg_release(msg); test_cleanup(); } @@ -217,8 +219,9 @@ static void test_give_men_requires_contact(CuTest * tc) { give_cmd(env.src, ord); CuAssertPtrEquals(tc, 0, test_find_messagetype(env.f1->msgs, "give_person")); CuAssertPtrNotNull(tc, test_find_messagetype(env.f1->msgs, "feedback_no_contact")); - free_order(ord); + msg_release(msg); + free_order(ord); test_cleanup(); } @@ -231,6 +234,7 @@ static void test_give_men_not_to_self(CuTest * tc) { msg = give_men(1, env.src, env.src, NULL); CuAssertStrEquals(tc, "error10", test_get_messagetype(msg)); CuAssertIntEquals(tc, 1, env.src->number); + msg_release(msg); test_cleanup(); } diff --git a/src/kernel/ship.c b/src/kernel/ship.c index d33ac5aaf..a2b7c556e 100644 --- a/src/kernel/ship.c +++ b/src/kernel/ship.c @@ -245,6 +245,7 @@ static void free_shiptype(void *ptr) { ship_type *stype = (ship_type *)ptr; free(stype->_name); free(stype->coasts); + free(stype->construction); free(stype); }