Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

CID 22488 Dereference after null check

Browse source
This commit is contained in:
Enno Rehling 2015-11-04 11:55:04 +01:00
parent 2d7aedea5e
commit a02b5f343e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/battle.c
View file

@ -4258,9 +4258,10 @@ static bool is_enemy(battle *b, unit *u1, unit *u2) {
for (es = b->sides; es != b->sides + b->nsides; ++es) { for (es = b->sides; es != b->sides + b->nsides; ++es) {
if (!s1 && es->faction == u1->faction) s1 = es; if (!s1 && es->faction == u1->faction) s1 = es;
else if (!s2 && es->faction == u2->faction) s2 = 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 { else {
return !help_enter(u1, u2); return !help_enter(u1, u2);