From a02b5f343e1402dfaeee4756e5d6a2620d531a06 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 4 Nov 2015 11:55:04 +0100
Subject: [PATCH] CID 22488 Dereference after null check

---
 src/battle.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/battle.c b/src/battle.c
index 853c908d7..dfbdb8099 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -4258,9 +4258,10 @@ static bool is_enemy(battle *b, unit *u1, unit *u2) {
             for (es = b->sides; es != b->sides + b->nsides; ++es) {
                 if (!s1 && es->faction == u1->faction) s1 = es;
                 else if (!s2 && es->faction == u2->faction) s2 = es;
-                if (s1 && s2) break;
+                if (s1 && s2) {
+                    return enemy(s1, s2);
+                }
             }
-            return enemy(s1, s2);
         }
         else {
             return !help_enter(u1, u2);