From 06b0e7a4446ba1bd7d0be701e3560cbeee584b3c Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Thu, 6 Aug 2009 20:50:13 +0200 Subject: [PATCH] [8326] Check getVictim() before IsInMap check in EventAI EVENT_T_RANGE and prevent possible crash. Signed-off-by: NoFantasy --- src/game/CreatureEventAI.cpp | 6 ++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp index a85aa7abd..c2df6c436 100644 --- a/src/game/CreatureEventAI.cpp +++ b/src/game/CreatureEventAI.cpp @@ -1089,9 +1089,11 @@ void CreatureEventAI::UpdateAI(const uint32 diff) break; case EVENT_T_RANGE: if (Combat) - if (m_creature->IsInMap(m_creature->getVictim())) - if (m_creature->IsInRange(m_creature->getVictim(),(float)(*i).Event.range.minDist,(float)(*i).Event.range.maxDist)) + { + if (m_creature->getVictim() && m_creature->IsInMap(m_creature->getVictim())) + if (m_creature->IsInRange(m_creature->getVictim(), (float)(*i).Event.range.minDist, (float)(*i).Event.range.maxDist)) ProcessEvent(*i); + } break; } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 94be353d6..cde51ab1f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8325" + #define REVISION_NR "8326" #endif // __REVISION_NR_H__