mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 02:45:32 +00:00
Code Issues Releases Wiki Activity

Replace condition that may lead to UB by assert

Browse source 
If mPackages is empty it means package is a pointer to a deleted object
at line . We can assume it couldn't happen because execute is always called
next for this object at line 289.
This commit is contained in:
elsid 2020-05-17 17:24:47 +02:00
parent b168544445
commit e3cce0949e
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwmechanics/aisequence.cpp
View file

@ -265,8 +265,8 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
} }
} }
if (!mPackages.empty()) assert(!mPackages.empty());
{
if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat) if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
{ {
// move combat package with nearest target to the front // move combat package with nearest target to the front
@ -275,7 +275,6 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
package = mPackages.front(); package = mPackages.front();
} }
}
try try
{ {