From 55ec76c2ce71d44775516dcf168328fb614b69ff Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 9 Apr 2017 01:08:28 +0200 Subject: Fix a null pointer in guild->isallied() Introduced in cb4297e6eb734c60825ebfa13f32989fa3a470eb, that doesn't check for a nonzero guild ID before calling guild->isallied(). Signed-off-by: Haru --- src/map/battle.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/map/battle.c b/src/map/battle.c index 827042cce..8a0a71645 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6815,10 +6815,10 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f int s_party = status->get_party_id(s_bl); int s_guild = status->get_guild_id(s_bl); int t_guild = status->get_guild_id(t_bl); - - if (s_party && s_party == status->get_party_id(t_bl)) { - if (map_flag_gvg(m) && map->list[m].flag.gvg_noparty && !(s_guild && s_guild == t_guild)) { - if (t_guild && guild->isallied(s_guild, t_guild)) + + if (s_party != 0 && s_party == status->get_party_id(t_bl)) { + if (map_flag_gvg(m) && map->list[m].flag.gvg_noparty) { + if (s_guild != 0 && t_guild != 0 && (s_guild == t_guild || guild->isallied(s_guild, t_guild))) state |= BCT_PARTY; else state |= flag&BCT_ENEMY ? BCT_ENEMY : BCT_PARTY; -- cgit v1.2.3-70-g09d2