Synchronize changes from 1.6 master branch [ci skip]

64fd352 Fix infinite loop in createColPolygon (Fixes #4263)
2f42d5b Fix runtime assertion errors

Author: github-actions[bot]

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);

Shared/sdk/SharedUtil.Tests.hpp

@@ -775,7 +775,7 @@ void SharedUtil_Hash_Tests()
         const SString b;
         const SString result;
         TEST_DATA = {
-            {"1234", "AB12£$_ ", "\xD2\xB4\x75\x5C\xDC\x15\x54\xC9"},
+            {"1234", "AB12£$_ ", "\x08\x56\x3B\x4F\x31\x2D\xE4\x4A"},
             {"Hello thereHello there", "78111E998C42243285635E39AFDD614B\0 AB12£$_ ", ""},
             {"78111E998C42243285635E39AFD\0D614B AB12£$_ ", "Hello thereHello there", ""},
         };
@@ -966,7 +966,7 @@ void SharedUtil_Hash_Tests()
         TEST_DATA = {
             {"", "D41D8CD98F00B204E9800998ECF8427E"},
             {"Hello there", "E8EA7A8D1E93E8764A84A0F3DF4644DE"},
-            {"AB12£$_\0 ", "78111E998C42243285635E39AFDD614B"},
+            {"AB12£$_\0 ", "135C3423B76DEECA446666DE48912C3B"},
         };
         TEST_END
     }
@@ -986,7 +986,7 @@ void SharedUtil_Hash_Tests()
         TEST_DATA = {
             {"", "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855"},
             {"Hello there", "4E47826698BB4630FB4451010062FADBF85D61427CBDFAED7AD0F23F239BED89"},
-            {"AB12£$_\0 ", "A427AEDD32E652FED23901406BCC49BF78B906E69699A68932638502E8C1138B"},
+            {"AB12£$_\0 ", "46CD8EB20A879864D5B7968679B6D60615BC64592D376FA10A90C064D9BA269F"},
         };
         TEST_END
     }
@@ -1006,7 +1006,7 @@ void SharedUtil_Hash_Tests()
         TEST_DATA = {
             {"", "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"},
             {"Hello there", "726C76553E1A3FDEA29134F36E6AF2EA05EC5CCE"},
-            {"AB12£$_\0 ", "CA7B95DF48B83232FCA0FE3FAE7A787784F54225"},
+            {"AB12£$_\0 ", "EDD865E6301DC1F3B578E12ACAB9A6363F1F0598"},
         };
         TEST_END
     }
@@ -1026,7 +1026,7 @@ void SharedUtil_Hash_Tests()
         TEST_DATA = {
             {"", "D14A028C2A3A2BC9476102BB288234C415A2B01F828EA62AC5B3E42F"},
             {"Hello there", "40AACC4967ECA7730A1A069539D78AE7782480802E481F1ECC26927D"},
-            {"AB12£$_\0 ", "73420F2E80A236DD7C836C68177E282BC8E86CD8BB497E5F443F1FAE"},
+            {"AB12£$_\0 ", "5CD74BB63D1F75CF4E4EB3967D101EC05DBF2E9E101BE932ABD18D27"},
         };
         TEST_END
     }
@@ -1046,7 +1046,7 @@ void SharedUtil_Hash_Tests()
         TEST_DATA = {
             {"", "38B060A751AC96384CD9327EB1B1E36A21FDB71114BE07434C0CC7BF63F6E1DA274EDEBFE76F65FBD51AD2F14898B95B"},
             {"Hello there", "7438E0294C534D6CA6CC2EFB04A60DB488C86B66C4CBD3C00D11D58C8020274AB0A2A720C88986968D894F26B16C461F"},
-            {"AB12£$_\0 ", "DFCAF84C21F93CC88DE6CB54D838FEE5ACF592DCF392883708BAD1CFF7B847DEA9A175C5E87014D5829E66E17571F7E6"},
+            {"AB12£$_\0 ", "D097C56CEB17C6553E216C42DA60EF85917738EAB9D5A7A62674945CF51F5945C3A573A1A7E9B40A9B427789110A2C14"},
         };
         TEST_END
     }
@@ -1066,7 +1066,7 @@ void SharedUtil_Hash_Tests()
         TEST_DATA = {
             {"", "CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E"},
             {"Hello there", "567683DDBA1F5A576B68EC26F41FFBCC7E718D646839AC6C2EF746FE952CEF4CBE6DEA635BC2F098B92B65CAACF482333BB9D1D9A3089BC4F01CB86F7A2FBC18"},
-            {"AB12£$_\0 ", "EE57E02866026848F988E793E9B099931CBCA8773B13EA5055ABA462885E8B044CE5C72CB528712CE2A442707F2BC25A52CC91F8C09DD1C6A6A5C9A63D52F320"},
+            {"AB12£$_\0 ", "6838166F7AE21CF8344B2F3A83AF2EAF34309AE3A84369BF2E59C7F0FA2971A5975CBC24CF079074FB579BF75920B2E83B0E01AFEDFDB5522240979D3EAA0B6C"},
         };
         TEST_END
     }