avoid code analysis warnings

src/alchemy.c

@@ -67,6 +67,7 @@ void new_potiontype(item_type * itype, int level)
     potion_type *ptype;
 
     ptype = (potion_type *)calloc(1, sizeof(potion_type));
+    assert(ptype);
     itype->flags |= ITF_POTION;
     ptype->itype = itype;
     ptype->level = level;

src/battle.c

@@ -488,7 +488,7 @@ contest_classic(int skilldiff, const armor_type * ar, const armor_type * sh)
         mod *= (1 + ar->penalty);
     if (sh != NULL)
         mod *= (1 + sh->penalty);
-    vw = (int)(100 - ((100 - vw) * mod));
+    vw = (int)(100.0 - ((100.0 - (double)vw) * mod));
 
     do {
         p = (int)(rng_int() % 100);
@@ -1226,7 +1226,7 @@ static void calculate_attack_type(troop dt, troop at, int type, bool missile,
 static int crit_damage(int attskill, int defskill, const char *damage_formula) {
   int damage = 0;
   if (rule_damage & DAMAGE_CRITICAL) {
-      double kritchance = (attskill * 3 - defskill) / 200.0;
+      double kritchance = ((double)attskill * 3.0 - (double)defskill) / 200.0;
       int maxk = 4;
 
       kritchance = fmax(kritchance, 0.005);
@@ -2079,6 +2079,7 @@ void dazzle(battle * b, troop * td)
 
 void damage_building(battle * b, building * bldg, int damage_abs)
 {
+    assert(bldg);
     bldg->size = MAX(1, bldg->size - damage_abs);
 
     /* Wenn Burg, dann gucken, ob die Leute alle noch in das Geb<65>ude passen. */
@@ -3428,11 +3429,12 @@ int join_battle(battle * b, unit * u, bool attack, fighter ** cp)
 
 battle *make_battle(region * r)
 {
-    battle *b = (battle *)calloc(1, sizeof(battle));
     unit *u;
     bfaction *bf;
     building * bld;
+    battle *b = (battle *)calloc(1, sizeof(battle));
 
+    assert(b);
     /* Alle Mann raus aus der Burg! */
     for (bld = r->buildings; bld != NULL; bld = bld->next)
         bld->sizeleft = bld->size;
@@ -3450,6 +3452,7 @@ battle *make_battle(region * r)
                 }
                 if (!bf) {
                     bf = (bfaction *)calloc(1, sizeof(bfaction));
+                    assert(bf);
                     ++b->nfactions;
                     bf->faction = u->faction;
                     bf->next = b->factions;
@@ -3473,14 +3476,16 @@ static void free_side(side * si)
 
 static void free_fighter(fighter * fig)
 {
+    armor **ap = &fig->armors;
+    while (*ap) {
+        armor *a = *ap;
+        ap = &a->next;
+        free(a);
+    }
+    fig->armors = NULL;
     while (fig->loot) {
         i_free(i_remove(&fig->loot, fig->loot));
     }
-    while (fig->armors) {
-        armor *a = fig->armors;
-        fig->armors = a->next;
-        free(a);
-    }
     free(fig->person);
     free(fig->weapons);
 
@@ -3492,13 +3497,14 @@ static void battle_free(battle * b) {
     assert(b);
 
     for (s = b->sides; s != b->sides + b->nsides; ++s) {
-        fighter *fnext = s->fighters;
-        while (fnext) {
-            fighter *fig = fnext;
-            fnext = fig->next;
+        fighter **fp = &s->fighters;
+        while (*fp) {
+            fighter *fig = *fp;
+            fp = &fig->next;
             free_fighter(fig);
             free(fig);
         }
+        s->fighters = NULL;
         free_side(s);
     }
     free(b);

src/kernel/unit.c

@@ -208,6 +208,7 @@ static buddy *get_friends(const unit * u, int *numfriends)
                     nf = *fr;
                     if (nf == NULL || nf->faction != u2->faction) {
                         nf = malloc(sizeof(buddy));
+                        assert(nf);
                         nf->next = *fr;
                         nf->faction = u2->faction;
                         nf->unit = u2;
@@ -1004,11 +1005,15 @@ skill *add_skill(unit * u, skill_t sk)
     skill *sv;
     int i;
 
+    assert(u);
     for (i = 0; i != u->skill_size; ++i) {
         sv = u->skills + i;
         if (sv->id >= sk) break;
     }
-    u->skills = realloc(u->skills, (1 + u->skill_size) * sizeof(skill));
+    sv = realloc(u->skills, (1 + u->skill_size) * sizeof(skill));
+    assert(sv);
+    u->skills = sv;
+
     sv = u->skills + i;
     if (i < u->skill_size) {
         assert(sv->id != sk);
@@ -1244,24 +1249,31 @@ int invisible(const unit * target, const unit * viewer)
  */
 void free_unit(unit * u)
 {
+    struct reservation **pres = &u->reservations;
+
     assert(!u->region);
     free(u->_name);
     free_order(u->thisorder);
     free_orders(&u->orders);
-    if (u->skills)
+
+    while (*pres) {
+        struct reservation *res = *pres;
+        pres = &res->next;
+        free(res);
+    }
+    u->reservations = NULL;
+    if (u->skills) {
         free(u->skills);
+        u->skills = NULL;
+    }
     while (u->items) {
         item *it = u->items->next;
         u->items->next = NULL;
         i_free(u->items);
         u->items = it;
     }
-    while (u->attribs)
+    while (u->attribs) {
         a_remove(&u->attribs, u->attribs);
-    while (u->reservations) {
-        struct reservation *res = u->reservations;
-        u->reservations = res->next;
-        free(res);
     }
 }
 

src/vortex.c

@@ -51,6 +51,7 @@ void register_special_direction(struct locale *lang, const char *name)
 
         if (lang == locales) {
             dir_lookup *dl = malloc(sizeof(dir_lookup));
+            assert(dl);
             dl->name = str;
             dl->oldname = token;
             dl->next = dir_name_lookup;