From a0a377a0cec135a377d431c24291c7c5092708ab Mon Sep 17 00:00:00 2001 From: Nay Date: Sat, 24 Aug 2013 01:54:37 +0100 Subject: [PATCH] Scripts: Fix two issues found by Valgrind ==3400== Invalid write of size 8 ==3400== at 0x1241C32: instance_ahnkahet::GetInstanceScript(InstanceMap*) const (instance_ahnkahet.cpp:54) ... ==3400== Conditional jump or move depends on uninitialised value(s) ==3400== at 0xB5DEAE: std::tr1::_Hashtable, std::allocator >, std::_Select1st >, std::equal_to, std::tr1::hash, std::tr1::__detail::_Mod_range_hashing, std::tr1::__detail::_Default_ranged_hash, std::tr1::__detail::_Prime_rehash_policy, false, false, true>::_M_find_node(std::tr1::__detail::_Hash_node, false>*, unsigned long const&, unsigned long) const (hashtable.h:830) ==3400== by 0xBDA4CA: std::tr1::_Hashtable, std::allocator >, std::_Select1st >, std::equal_to, std::tr1::hash, std::tr1::__detail::_Mod_range_hashing, std::tr1::__detail::_Default_ranged_hash, std::tr1::__detail::_Prime_rehash_policy, false, false, true>::find(unsigned long const&) (hashtable.h:698) ==3400== by 0xBDA5BF: HashMapHolder::Find(unsigned long) (ObjectAccessor.h:67) ==3400== by 0xCB5C03: Map::GetCreature(unsigned long) (ObjectAccessor.h:114) ==3400== by 0xB6E6EF: Unit::GetCreature(WorldObject&, unsigned long) (Unit.cpp:13023) ==3400== by 0x10F0790: boss_hydross_the_unstable::boss_hydross_the_unstableAI::Reset() (boss_hydross_the_unstable.cpp:164) --- .../Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp | 5 +++-- .../SerpentShrine/boss_hydross_the_unstable.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 82b334de51..7207bbd3aa 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -49,9 +49,10 @@ class instance_ahnkahet : public InstanceMapScript JedogaTarget = 0; SwitchTrigger = 0; - InitiandGUIDs.clear(); + SpheresState[0] = 0; + SpheresState[1] = 0; - memset(SpheresState, 0, 2 * sizeof(uint64)); + InitiandGUIDs.clear(); } void OnCreatureCreate(Creature* creature) OVERRIDE diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index db270c943e..d6205cb3ec 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -94,6 +94,8 @@ public: boss_hydross_the_unstableAI(Creature* creature) : ScriptedAI(creature), Summons(me) { instance = creature->GetInstanceScript(); + beams[0] = 0; + beams[1] = 0; } InstanceScript* instance; @@ -159,10 +161,9 @@ public: } void DeSummonBeams() { - for (uint8 i=0; i<2; ++i) + for (uint8 i = 0; i < 2; ++i) { - Creature* mob = Unit::GetCreature(*me, beams[i]); - if (mob) + if (Creature* mob = Unit::GetCreature(*me, beams[i])) { mob->setDeathState(DEAD); mob->RemoveCorpse();