araxiaonline/AscEmu
3
0
Fork 0
mirror of https://github.com/araxiaonline/AscEmu.git synced 2026-06-13 03:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

V522 Dereferencing of the null pointer 'm_duelPlayer' might take place. Player.cpp 11929

Browse Source 
V595 The 'm_Unit->getWorldMap()' pointer was utilized before it was verified against nullptr. Check lines: 2963, 2988. AIInterface.cpp 2963
This commit is contained in:
Zyres
2023-07-08 19:50:53 +02:00
parent 4645858346
commit d4ca6cc8fb
2 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/world/Objects/Units/Creatures/AIInterface.cpp
View File

@@ -2960,75 +2960,72 @@ void AIInterface::eventUnitDied(Unit* pUnit, uint32_t /*misc1*/)
InstanceMap* pInstance = nullptr;
auto unitMapMgr = m_Unit->getWorldMap();
if (unitMapMgr)
pInstance = m_Unit->getWorldMap()->getInstance();
if (unitMapMgr
&& m_Unit->isCreature()
&& !m_Unit->isPet()
&& pInstance)
{
Creature* pCreature = static_cast<Creature*>(m_Unit);
pInstance = unitMapMgr->getInstance();
if (pInstance->isRaidOrHeroicDungeon())
if (m_Unit->isCreature() && !m_Unit->isPet() && pInstance)
{
if (pCreature->isDungeonBoss())
pInstance->permBindAllPlayers();
}
else
{
// the reset time is set but not added to the scheduler
// until the players leave the instance
const auto now = Util::getTimeNow();
time_t resettime = now + 2 * HOUR;
if (InstanceSaved* save = sInstanceMgr.getInstanceSave(pCreature->GetInstanceID()))
if (save->getResetTime() < resettime)
save->setResetTime(resettime);
}
Creature* pCreature = static_cast<Creature*>(m_Unit);
if (m_Unit->getWorldMap() && m_Unit->getWorldMap()->getScript())
{
// Set Instance Data
// set encounter state to Performed
uint32_t i = 0;
for (const auto boss : m_Unit->getWorldMap()->getScript()->getBosses())
if (pInstance->isRaidOrHeroicDungeon())
{
if (m_Unit->getEntry() == boss.entry)
if (pCreature->isDungeonBoss())
pInstance->permBindAllPlayers();
}
else
{
// the reset time is set but not added to the scheduler
// until the players leave the instance
const auto now = Util::getTimeNow();
time_t resettime = now + 2 * HOUR;
if (InstanceSaved* save = sInstanceMgr.getInstanceSave(pCreature->GetInstanceID()))
if (save->getResetTime() < resettime)
save->setResetTime(resettime);
}
if (unitMapMgr->getScript())
{
// Set Instance Data
// set encounter state to Performed
uint32_t i = 0;
for (const auto boss : unitMapMgr->getScript()->getBosses())
{
if (m_Unit->getWorldMap() && m_Unit->getWorldMap()->getScript())
m_Unit->getWorldMap()->getScript()->setBossState(i, Performed);
if (m_Unit->getEntry() == boss.entry)
{
if (unitMapMgr->getScript())
unitMapMgr->getScript()->setBossState(i, Performed);
}
i++;
}
}
// Killed Group checks
auto spawnGroupData = sMySQLStore.getSpawnGroupDataBySpawn(pCreature->spawnid);
// Spawn Group Handling
if (spawnGroupData && spawnGroupData->groupId)
{
bool killed = true;
for (auto spawns : spawnGroupData->spawns)
{
if (!unitMapMgr->getRespawnInfo(SPAWN_TYPE_CREATURE, spawns.first))
killed = false;
}
if (killed)
{
if (unitMapMgr->getScript())
unitMapMgr->getScript()->OnSpawnGroupKilled(spawnGroupData->groupId);
}
i++;
}
}
// Killed Group checks
auto spawnGroupData = sMySQLStore.getSpawnGroupDataBySpawn(pCreature->spawnid);
// Spawn Group Handling
if (spawnGroupData && spawnGroupData->groupId)
if (unitMapMgr->getBaseMap()->getMapInfo() && unitMapMgr->getBaseMap()->getMapInfo()->isRaid())
{
bool killed = true;
for (auto spawns : spawnGroupData->spawns)
if (m_Unit->isCreature())
{
if (!unitMapMgr->getRespawnInfo(SPAWN_TYPE_CREATURE, spawns.first))
killed = false;
}
if (killed)
{
if (unitMapMgr->getScript())
unitMapMgr->getScript()->OnSpawnGroupKilled(spawnGroupData->groupId);
}
}
}
if (unitMapMgr && unitMapMgr->getBaseMap()->getMapInfo() && unitMapMgr->getBaseMap()->getMapInfo()->isRaid())
{
if (m_Unit->isCreature())
{
if (dynamic_cast<Creature*>(m_Unit)->GetCreatureProperties()->Rank == 3)
{
unitMapMgr->removeCombatInProgress(m_Unit->getGuid());
if (dynamic_cast<Creature*>(m_Unit)->GetCreatureProperties()->Rank == 3)
unitMapMgr->removeCombatInProgress(m_Unit->getGuid());
}
}
}

6
src/world/Objects/Units/Players/Player.cpp
View File

@@ -11923,15 +11923,15 @@ void Player::cancelDuel()
m_duelPlayer->m_duelState = DUEL_STATE_FINISHED;
m_duelState = DUEL_STATE_FINISHED;
m_duelPlayer->m_duelPlayer = nullptr;
m_duelPlayer = nullptr;
m_duelPlayer->setDuelTeam(0);
setDuelTeam(0);
m_duelPlayer->m_duelCountdownTimer = 0;
m_duelCountdownTimer = 0;
m_duelPlayer->m_duelPlayer = nullptr;
m_duelPlayer = nullptr;
for (const auto& summonedPet : getSummons())
{
if (summonedPet && summonedPet->isAlive())