fang139842/azerothcore-wotlk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(Core/Common): Container fixes use after free (#21460)

Browse Source
This commit is contained in:
Jelle Meeus 2025-02-15 22:22:30 +01:00 committed by GitHub
parent 75752880e2
commit a05833eeed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/Utilities/Containers.h
View File

@ -138,18 +138,28 @@ namespace Acore::Containers
}
/*
* Select a random element from a container.
* @brief Selects a random element from a container that matches the given predicate
*
* @param container Source container to select from
* @param predicate Unary predicate to filter elements
* @return Iterator to the randomly selected element, or end iterator if no elements match the predicate
*
* Note: container cannot be empty
*/
template<class C, class Predicate>
inline auto SelectRandomContainerElementIf(C const& container, Predicate&& predicate) -> typename std::add_const<decltype(*std::begin(container))>::type&
inline auto SelectRandomContainerElementIf(C const& container, Predicate&& predicate) -> decltype(std::begin(container))
{
C containerCopy;
std::copy_if(std::begin(container), std::end(container), std::inserter(containerCopy, std::end(containerCopy)), predicate);
auto it = std::begin(containerCopy);
std::advance(it, urand(0, uint32(std::size(containerCopy)) - 1));
return *it;
std::vector<decltype(std::begin(container))> matchingElements;
for (auto it = std::begin(container); it != std::end(container); ++it)
if (predicate(*it))
matchingElements.push_back(it);
if (matchingElements.empty())
return std::end(container);
auto randomIt = matchingElements[urand(0, matchingElements.size() - 1)];
return randomIt;
}
/*

5
src/server/game/Entities/Object/Position.h
View File

@ -64,6 +64,11 @@ struct Position
return !(operator==(a));
}
inline bool operator!=(Position const& a) const
{
return !(operator==(a));
}
operator G3D::Vector3() const
{
return { m_positionX, m_positionY, m_positionZ };

4
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@ -205,10 +205,12 @@ public:
{
if (_availableRiftPositions.size() > 1)
{
spawnPos = Acore::Containers::SelectRandomContainerElementIf(_availableRiftPositions, [&](Position pos) -> bool
auto spawnPosItr = Acore::Containers::SelectRandomContainerElementIf(_availableRiftPositions, [&](Position const& pos) -> bool
{
return pos != lastPosition;
});
if (spawnPosItr != _availableRiftPositions.end())
spawnPos = *spawnPosItr;
}
else
{

5
src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
View File

@ -93,10 +93,13 @@ struct boss_laj : public BossAI
ScheduleTimedEvent(30s, [&] {
me->RemoveAurasDueToSpell(_lastTransform.spellId);
_lastTransform = Acore::Containers::SelectRandomContainerElementIf(_transformContainer, [&](LajTransformData data) -> bool
auto lastTransformItr = Acore::Containers::SelectRandomContainerElementIf(_transformContainer, [&](LajTransformData const& data) -> bool
{
return data.spellId != _lastTransform.spellId;
});
if (lastTransformItr == _transformContainer.end())
return;
_lastTransform = *lastTransformItr;
me->SetDisplayId(_lastTransform.modelId);
DoCastSelf(_lastTransform.spellId, true);
}, 35s);