diff options
| author | jackpoz <giacomopoz@gmail.com> | 2013-08-30 21:27:04 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-08-30 21:27:04 +0100 |
| commit | be7d82ba8de464d0d0a817bb4adbfa81930e68d0 (patch) | |
| tree | 7fb1397c19401aec454fe8dc3505adeaacfb3231 /src/server/game | |
| parent | dd7802c0ec7e42cf6943140b86f7687eb2e730cf (diff) | |
Core/Maps: Fix Spline triggered assert
Fix an assert triggered by float to int32 cast overflowing to -1, now it replaces -1 with max int32 value.
Fix another assert triggered by Vector3 magnitude float overflow to max/infinity in StaticMapTree::isInLineOfSight(), in this case return false.
Both asserts can be reproduced by casting Mind Control to a NPC, tele to z: 1.0e+38 using client hack tools, move to allow the server to register the new position and stop Mind Control.
Closes #8970
Closes #10578
Closes #10355
Closes #10673
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Movement/Spline/Spline.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index 42090cae71b..d4b100ee46e 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -21,6 +21,7 @@ #include "MovementTypedefs.h" #include <G3D/Vector3.h> +#include <limits> namespace Movement { @@ -184,6 +185,9 @@ public: while (i < index_hi) { new_length = cacher(*this, i); + // length overflowed, assign to max positive value + if (new_length < 0) + new_length = std::numeric_limits<length_type>::max(); lengths[++i] = new_length; ASSERT(prev_length <= new_length); |
