Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

[7417] Fixed crash at access by unexpected NULL pointer in quest templates map. Author: VladimirMangos

Browse Source 
Never never use operator[] for _access_ to elements std::map.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-09 17:40:40 -06:00
parent 9bfd8a08e9
commit fb9f44bf80
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/ObjectMgr.cpp
View File

@@ -3381,14 +3381,15 @@ void ObjectMgr::LoadQuests()
if(qinfo->NextQuestInChain)
{
if(mQuestTemplates.find(qinfo->NextQuestInChain) == mQuestTemplates.end())
QuestMap::iterator qNextItr = mQuestTemplates.find(qinfo->NextQuestInChain);
if(qNextItr == mQuestTemplates.end())
{
sLog.outErrorDb("Quest %u has `NextQuestInChain` = %u but quest %u does not exist, quest chain will not work.",
qinfo->GetQuestId(),qinfo->NextQuestInChain ,qinfo->NextQuestInChain );
qinfo->NextQuestInChain = 0;
}
else
mQuestTemplates[qinfo->NextQuestInChain]->prevChainQuests.push_back(qinfo->GetQuestId());
qNextItr->second->prevChainQuests.push_back(qinfo->GetQuestId());
}
// fill additional data stores
@@ -3406,14 +3407,15 @@ void ObjectMgr::LoadQuests()
if(qinfo->NextQuestId)
{
if (mQuestTemplates.find(abs(qinfo->GetNextQuestId())) == mQuestTemplates.end())
QuestMap::iterator qNextItr = mQuestTemplates.find(abs(qinfo->GetNextQuestId()));
if (qNextItr == mQuestTemplates.end())
{
sLog.outErrorDb("Quest %d has NextQuestId %i, but no such quest", qinfo->GetQuestId(), qinfo->GetNextQuestId());
}
else
{
int32 signedQuestId = qinfo->NextQuestId < 0 ? -int32(qinfo->GetQuestId()) : int32(qinfo->GetQuestId());
mQuestTemplates[abs(qinfo->GetNextQuestId())]->prevQuests.push_back(signedQuestId);
qNextItr->second->prevQuests.push_back(signedQuestId);
}
}
@@ -5171,7 +5173,8 @@ void ObjectMgr::LoadAccessRequirements()
if(ar.heroicQuest)
{
if(!mQuestTemplates[ar.heroicQuest])
QuestMap::iterator qReqItr = mQuestTemplates.find(ar.heroicQuest);
if(qReqItr != mQuestTemplates.end())
{
sLog.outErrorDb("Required Heroic Quest %u not exist for trigger %u, remove heroic quest done requirement.",ar.heroicQuest,requiremt_ID);
ar.heroicQuest = 0;
@@ -5180,7 +5183,8 @@ void ObjectMgr::LoadAccessRequirements()
if(ar.quest)
{
if(!mQuestTemplates[ar.quest])
QuestMap::iterator qReqItr = mQuestTemplates.find(ar.quest);
if(qReqItr != mQuestTemplates.end())
{
sLog.outErrorDb("Required Quest %u not exist for trigger %u, remove quest done requirement.",ar.quest,requiremt_ID);
ar.quest = 0;