From c1e86e4fa09efd341c5050f68764b950797a7c85 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 4 Jun 2005 01:43:38 +0000
Subject: [PATCH] - asserting on valid return values from recruit-function -
 fixing  crashbug with --lomem)

---
 src/common/gamecode/economy.c | 15 ++++++++-------
 src/common/kernel/region.c    |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index 4137194ca..22886ebb3 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -389,21 +389,22 @@ expandrecruit(region * r, request * recruitorders)
   /* centaurs: */
   recruits = select_recruitment(&recruitorders, horse_recruiters, &total);
   if (recruits) {
-    int horses = rhorses(r) * 2;
+    int recruited, horses = rhorses(r) * 2;
     if (total<horses) horses = total;
-    horses = horses / 2 - do_recruiting(recruits, horses);
-    rsethorses(r, horses);
+    recruited = do_recruiting(recruits, horses);
+    rsethorses(r, (horses - recruited) / 2);
     free_recruitments(recruits);
   }
 
   /* peasant limited: */
   recruits = select_recruitment(&recruitorders, peasant_recruiters, &total);
   if (recruits) {
-    int peasants = rpeasants(r);
-    int rfrac = (2 * peasants) / RECRUITFRACTION; /* anzahl orks. 2 ork = 1 bauer */
+    int recruited, peasants = rpeasants(r) * 2;
+    int rfrac = peasants / RECRUITFRACTION; /* anzahl orks. 2 ork = 1 bauer */
     if (total<rfrac) rfrac = total;
-    peasants = peasants - (1 + do_recruiting(recruits, rfrac))/2;
-    rsetpeasants(r, peasants);
+    recruited = do_recruiting(recruits, rfrac);
+    assert(recruited<=rfrac);
+    rsetpeasants(r, (peasants - recruited)/2);
     free_recruitments(recruits);
   }
 
diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c
index 2374a7cf6..50a309487 100644
--- a/src/common/kernel/region.c
+++ b/src/common/kernel/region.c
@@ -810,7 +810,7 @@ free_region(region * r)
   while (r->individual_messages) {
     struct individual_message * msg = r->individual_messages;
     r->individual_messages = msg->next;
-    free_messagelist(msg->msgs);
+    if (msg->msgs) free_messagelist(msg->msgs);
     free(msg);
   }