aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement/MotionMaster.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-12-12 09:50:52 +0100
committerShauren <shauren.trinity@gmail.com>2013-12-12 09:50:52 +0100
commit54fd53f7e3575ad24b6daf88f628afdd52b9df04 (patch)
tree3d2e8b93dff4e76ebfac9b143a04969e3716e939 /src/server/game/Movement/MotionMaster.cpp
parent385e2dba379d42cf09c9cb36bee728113769d528 (diff)
Core/Movement: Fixed possible invalid memory access
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 60855710218..6da798aaa17 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -72,7 +72,8 @@ MotionMaster::~MotionMaster()
{
MovementGenerator *curr = top();
pop();
- if (curr) DirectDelete(curr);
+ if (curr && !isStatic(curr))
+ delete curr; // Skip finalizing on delete, it might launch new movement
}
}