Fix infinite loop in createColPolygon (Fixes #4263)

botder · botder · commit 64fd35218349 · 2025-06-22T17:21:07.000+02:00
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp
@@ -292,7 +292,7 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)
     std::vector<CVector2D> vecPointList;
 
     CScriptArgReader argStream(luaVM);
-    for (uint i = 0; i < 4 || argStream.NextIsVector2D(); i++)
+    for (uint i = 0; !argStream.HasErrors() && (i < 4 || argStream.NextIsVector2D()); i++)
     {
         CVector2D vecPoint;
         argStream.ReadVector2D(vecPoint);

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ int CLuaColShapeDefs::CreateColPolygon(lua_State* luaVM)`
`292`	`292`	`std::vector<CVector2D> vecPointList;`
`293`	`293`
`294`	`294`	`CScriptArgReader argStream(luaVM);`
`295`		`- for (uint i = 0; i < 4 \|\| argStream.NextIsVector2D(); i++)`
	`295`	`+ for (uint i = 0; !argStream.HasErrors() && (i < 4 \|\| argStream.NextIsVector2D()); i++)`
`296`	`296`	`{`
`297`	`297`	`CVector2D vecPoint;`
`298`	`298`	`argStream.ReadVector2D(vecPoint);`