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

This commit is contained in:
Jelle Meeus
2025-02-15 22:22:30 +01:00
committed by GitHub
parent 75752880e2
commit a05833eeed
4 changed files with 29 additions and 9 deletions
+17 -7
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 * Note: container cannot be empty
*/ */
template<class C, class Predicate> 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::vector<decltype(std::begin(container))> matchingElements;
std::copy_if(std::begin(container), std::end(container), std::inserter(containerCopy, std::end(containerCopy)), predicate);
auto it = std::begin(containerCopy); for (auto it = std::begin(container); it != std::end(container); ++it)
std::advance(it, urand(0, uint32(std::size(containerCopy)) - 1)); if (predicate(*it))
return *it; matchingElements.push_back(it);
if (matchingElements.empty())
return std::end(container);
auto randomIt = matchingElements[urand(0, matchingElements.size() - 1)];
return randomIt;
} }
/* /*
@@ -64,6 +64,11 @@ struct Position
return !(operator==(a)); return !(operator==(a));
} }
inline bool operator!=(Position const& a) const
{
return !(operator==(a));
}
operator G3D::Vector3() const operator G3D::Vector3() const
{ {
return { m_positionX, m_positionY, m_positionZ }; return { m_positionX, m_positionY, m_positionZ };
@@ -205,10 +205,12 @@ public:
{ {
if (_availableRiftPositions.size() > 1) 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; return pos != lastPosition;
}); });
if (spawnPosItr != _availableRiftPositions.end())
spawnPos = *spawnPosItr;
} }
else else
{ {
@@ -93,10 +93,13 @@ struct boss_laj : public BossAI
ScheduleTimedEvent(30s, [&] { ScheduleTimedEvent(30s, [&] {
me->RemoveAurasDueToSpell(_lastTransform.spellId); 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; return data.spellId != _lastTransform.spellId;
}); });
if (lastTransformItr == _transformContainer.end())
return;
_lastTransform = *lastTransformItr;
me->SetDisplayId(_lastTransform.modelId); me->SetDisplayId(_lastTransform.modelId);
DoCastSelf(_lastTransform.spellId, true); DoCastSelf(_lastTransform.spellId, true);
}, 35s); }, 35s);