[11492] Fix possible crash at guardian pet unsummon

mangos · May 15, 2011 · 708ed71 · 708ed71
1 parent 3489554
commit 708ed71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -5962,10 +5962,12 @@ void Unit::RemoveGuardians()
 {
     while (!m_guardianPets.empty())
     {
-        if (Pet* pet = GetMap()->GetPet(*m_guardianPets.begin()))
+        ObjectGuid guid = *m_guardianPets.begin();
+
+        if (Pet* pet = GetMap()->GetPet(guid))
             pet->Unsummon(PET_SAVE_AS_DELETED, this);
 
-        m_guardianPets.erase(m_guardianPets.begin());
+        m_guardianPets.erase(guid);
     }
 }
 

diff --git 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 "11491"
+ #define REVISION_NR "11492"
 #endif // __REVISION_NR_H__