From: sapier <Sapier at GMX dot net>
Date: Wed, 16 Jan 2013 23:27:11 +0000 (+0000)
Subject: add limit for steps to avoid runaway memory consumption by collision handling
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=12e9f3d010f887c3fe0b32f3ddbf25f2ef6b7323;p=zefram%2Fminetest%2Fminetest_engine.git

add limit for steps to avoid runaway memory consumption by collision handling
---

diff --git a/src/collision.cpp b/src/collision.cpp
index 143b559f..eb948e3c 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -199,6 +199,10 @@ collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
 	/*
 		Calculate new velocity
 	*/
+	if( dtime > 0.5 ) {
+		infostream<<"collisionMoveSimple: WARNING: maximum step interval exceeded, lost movement details!"<<std::endl;
+		dtime = 0.5;
+	}
 	speed_f += accel_f * dtime;
 
     // If there is no speed, there are no collisions