From 7e1f3dbdc55aacef01fa2345eab02b6b44ad2a8b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 19 Nov 2017 02:44:13 +0100 Subject: [PATCH 1/2] fix bug 2386, int overflow --- src/kernel/unit.c | 2 +- src/kernel/unit.test.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/kernel/unit.c b/src/kernel/unit.c index 9c08f9dc1..09e8d75e0 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -1060,7 +1060,7 @@ void clone_men(const unit * u, unit * dst, int n) transfer_curse(u, dst, n); } set_number(dst, dst->number + n); - dst->hp += u->hp * dst->number / u->number; + dst->hp += (long)u->hp * dst->number / u->number; assert(dst->hp >= dst->number); /* TODO: Das ist schnarchlahm! und gehoert nicht hierhin */ a = a_find(dst->attribs, &at_effect); diff --git a/src/kernel/unit.test.c b/src/kernel/unit.test.c index 6ab8ee21a..1d74336c9 100644 --- a/src/kernel/unit.test.c +++ b/src/kernel/unit.test.c @@ -525,6 +525,25 @@ static void test_unlimited_units(CuTest *tc) { test_cleanup(); } +static void test_clone_men_bug_2386(CuTest *tc) { + unit *u1, *u2; + region *r; + faction *f; + + test_setup(); + r = test_create_region(0, 0, NULL); + f = test_create_faction(NULL); + u1 = test_create_unit(f, r); + scale_number(u1, 8237); + u1->hp = 39 * u1->number; + u2 = test_create_unit(f, r); + scale_number(u2, 0); + clone_men(u1, u2, 8100); + CuAssertIntEquals(tc, 8100, u2->number); + CuAssertIntEquals(tc, u2->number * 39, u2->hp); + test_cleanup(); +} + static void test_clone_men(CuTest *tc) { unit *u1, *u2; region *r; @@ -557,6 +576,7 @@ CuSuite *get_unit_suite(void) SUITE_ADD_TEST(suite, test_unit_name_from_race); SUITE_ADD_TEST(suite, test_update_monster_name); SUITE_ADD_TEST(suite, test_clone_men); + SUITE_ADD_TEST(suite, test_clone_men_bug_2386); SUITE_ADD_TEST(suite, test_remove_unit); SUITE_ADD_TEST(suite, test_remove_empty_units); SUITE_ADD_TEST(suite, test_remove_units_without_faction); From 1c24628d625412280bcfc7810f49f354a79ad38d Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 1 Sep 2017 22:04:36 +0200 Subject: [PATCH 2/2] BUG 2362: clone_men hitpoint calculation was wrong. --- src/kernel/unit.c | 2 +- src/kernel/unit.test.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/kernel/unit.c b/src/kernel/unit.c index 09e8d75e0..ba19ebe93 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -1060,7 +1060,7 @@ void clone_men(const unit * u, unit * dst, int n) transfer_curse(u, dst, n); } set_number(dst, dst->number + n); - dst->hp += (long)u->hp * dst->number / u->number; + dst->hp += (long)u->hp * n / u->number; assert(dst->hp >= dst->number); /* TODO: Das ist schnarchlahm! und gehoert nicht hierhin */ a = a_find(dst->attribs, &at_effect); diff --git a/src/kernel/unit.test.c b/src/kernel/unit.test.c index 1d74336c9..5661d3f2f 100644 --- a/src/kernel/unit.test.c +++ b/src/kernel/unit.test.c @@ -567,6 +567,27 @@ static void test_clone_men(CuTest *tc) { test_cleanup(); } +static void test_transfermen(CuTest *tc) { + unit *u1, *u2; + region *r; + faction *f; + test_setup(); + r = test_create_region(0, 0, NULL); + f = test_create_faction(NULL); + u1 = test_create_unit(f, r); + scale_number(u1, 3500); + u2 = test_create_unit(f, r); + scale_number(u2, 3500); + CuAssertIntEquals(tc, 70000, u1->hp); + CuAssertIntEquals(tc, 70000, u2->hp); + transfermen(u1, u2, u1->number); + CuAssertIntEquals(tc, 7000, u2->number); + CuAssertIntEquals(tc, 140000, u2->hp); + CuAssertIntEquals(tc, 0, u1->number); + CuAssertIntEquals(tc, 0, u1->hp); + test_cleanup(); +} + CuSuite *get_unit_suite(void) { CuSuite *suite = CuSuiteNew(); @@ -577,6 +598,7 @@ CuSuite *get_unit_suite(void) SUITE_ADD_TEST(suite, test_update_monster_name); SUITE_ADD_TEST(suite, test_clone_men); SUITE_ADD_TEST(suite, test_clone_men_bug_2386); + SUITE_ADD_TEST(suite, test_transfermen); SUITE_ADD_TEST(suite, test_remove_unit); SUITE_ADD_TEST(suite, test_remove_empty_units); SUITE_ADD_TEST(suite, test_remove_units_without_faction);