aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorSpp <none@none>2010-12-13 21:31:55 +0100
committerSpp <none@none>2010-12-13 21:31:55 +0100
commit89a33bbf612fcd0d5cea8e1fc5deff87e53aa67e (patch)
tree7af78ca3232133f6619cf26549465b140a42b985 /src/server/game/Server
parent865f35a63702d5ab723cfbc2ea5a5f3e76e2f344 (diff)
Core/Dungeon Finder: Fix a crash in Join when there are no dungeons available for that group (And probably other random crashes that appear when having DF enabled)
Core/Dungeon Finder: Tab2spaces + remove trailing spaces in LFG* files. Notes to self: - assign NULL to a pointer parameter will not change the pointer value outside the scope of the function - deleting a const_iterator can lead to mem corruption --HG-- branch : trunk
Diffstat (limited to 'src/server/game/Server')
-rwxr-xr-xsrc/server/game/Server/Protocol/Handlers/LFGHandler.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
index afaeac66d09..e0a58aa029d 100755
--- a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
@@ -31,16 +31,13 @@ void BuildPlayerLockDungeonBlock(WorldPacket &data, LfgLockStatusSet* lockSet)
data << uint8(0);
return;
}
-
+
data << uint32(lockSet->size()); // Size of lock dungeons
- for (LfgLockStatusSet::iterator it = lockSet->begin(); it != lockSet->end(); ++it)
+ for (LfgLockStatusSet::const_iterator it = lockSet->begin(); it != lockSet->end(); ++it)
{
data << uint32((*it)->dungeon); // Dungeon entry + type
data << uint32((*it)->lockstatus); // Lock status
- delete (*it);
}
- delete lockSet;
- lockSet = NULL;
}
void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap* lockMap)
@@ -57,8 +54,6 @@ void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap* lockMap)
data << uint64(MAKE_NEW_GUID(it->first, 0, HIGHGUID_PLAYER)); // Player guid
BuildPlayerLockDungeonBlock(data, it->second);
}
- delete lockMap;
- lockMap = NULL;
}
void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data)