Refactor test setup, fix UDK CI builds, fix UDK array OOB warnings

tuokri · Jul 4, 2024 · af8c7d0 · af8c7d0
1 parent 2acc8c2
commit af8c7d0
Show file tree

Hide file tree

Showing 7 changed files with 197 additions and 94 deletions.
diff --git a/.github/workflows/udk-tests.yaml b/.github/workflows/udk-tests.yaml
@@ -9,7 +9,7 @@ on:
 # TODO: unify GH env vars with local UDKTests env vars somehow.
 env:
   UDK_LITE_CACHE: ${{ github.workspace }}/UDKTests/.cache/
-  UDK_LITE_TAG: 1.0.1
+  UDK_LITE_TAG: 1.0.2
   # Timeout for individual steps in the test script. Not a total timeout.
   UDK_TEST_TIMEOUT: 300
   PYTHONUNBUFFERED: 1

diff --git a/Classes/FCryptoBigInt.uc b/Classes/FCryptoBigInt.uc
@@ -265,6 +265,7 @@ static final function MemMove(
     local int Mask;
     local array<byte> DstBytes;
     local int DstTmp;
+    local int MaxIntIndex;
 
     DstBytes.Length = NumBytes;
 
@@ -291,10 +292,18 @@ static final function MemMove(
     Shift = 8;
     Mask = 0xff << Shift;
     IntIndex = DstOffset;
+
+    MaxIntIndex = FFloor(DstOffset + (NumBytes / 2));
+    if (MaxIntIndex >= Dst.Length)
+    {
+        Dst.Length = MaxIntIndex + 1;
+    }
+
     for (ByteIndex = 0; ByteIndex < NumBytes; ++ByteIndex)
     {
-        `fcsdebug("IntIndex=" $ IntIndex);
+        // `fcsdebug("IntIndex=" $ IntIndex);
 
+        // TODO: is DstTmp needed? (Also check other memory functions).
         DstTmp = (Dst[IntIndex] & ~Mask) | ((DstBytes[ByteIndex] & 0xff) << Shift);
         Dst[IntIndex] = DstTmp;
 
@@ -555,6 +564,12 @@ static final function int Sub(
 
     Cc = 0;
     M = (A[0] + 31) >>> 4;
+
+    if (M > A.Length)
+    {
+        A.Length = M;
+    }
+
     for (U = 1; U < M; ++U)
     {
         Aw = A[U];

diff --git a/Classes/FCryptoGMPClient.uc b/Classes/FCryptoGMPClient.uc
@@ -46,7 +46,9 @@ var private array<string> Responses;
 var private int TransactionID;
 var private array<string> TransactionStack;
 
+var bool bTestMutatorDone;
 var bool bDone;
+
 struct PendingCheck
 {
     var string TestName;
@@ -90,6 +92,11 @@ simulated event Tick(float DeltaTime)
     local int Temp;
     local bool bSuccess;
 
+    if (bDone && bTestMutatorDone)
+    {
+        return;
+    }
+
     for (I = 0; I < Responses.Length; ++I)
     {
         if (Responses[I] == "SERVER_ERROR")
@@ -188,8 +195,8 @@ simulated event Tick(float DeltaTime)
     if (ChecksDone > 0 && (ChecksDone >= RequiredChecks))
     {
         `fclog("--- ALL CHECKS DONE" @ ChecksDone $ "/" $ RequiredChecks @ "---");
-        ChecksDone = 0;
-        RequiredChecks = 0;
+        // ChecksDone = 0;
+        // RequiredChecks = 0;
 
         if (Failures > 0)
         {
@@ -253,7 +260,8 @@ final simulated function Eq(string GMPOperandName, const out array<int> B,
     Check.BigIntOperand = B;
 
     PendingChecks.AddItem(Check);
-    RequiredChecks = PendingChecks.Length;
+    // RequiredChecks = PendingChecks.Length;
+    ++RequiredChecks;
 }
 
 final simulated function RandPrime(int Size)