Reduce the length of the array

Tommo-L · Jul 26, 2019 · a013394 · a013394
1 parent 4a111bc
commit a013394
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/neo/Consensus/ConsensusContext.cs b/neo/Consensus/ConsensusContext.cs
@@ -220,14 +220,14 @@ public ConsensusPayload MakePrepareRequest()
 
             Transactions = new Dictionary<UInt256, Transaction>();
             uint maxBlockSize = NativeContract.Policy.GetMaxBlockSize(Snapshot);
-            TransactionHashes = new UInt256[NativeContract.Policy.GetMaxTransactionsPerBlock(Snapshot)];
+            TransactionHashes = new UInt256[Math.Min(transactions.Count, NativeContract.Policy.GetMaxTransactionsPerBlock(Snapshot))];
 
             // Prevent that block exceed the max size
 
             Block.Transactions = new Transaction[0];
             var fixedSize = Block.Size + IO.Helper.GetVarSize(TransactionHashes.Length); // ensure that the var size grows without exceed the max size
 
-            for (int x = 0, max = Math.Min(Transactions.Count, transactions.Count); x < max; x++)
+            for (int x = 0, max = TransactionHashes.Length; x < max; x++)
             {
                 var tx = transactions[x];
 
@@ -240,7 +240,10 @@ public ConsensusPayload MakePrepareRequest()
 
             // Truncate null values
 
-            Array.Resize(ref TransactionHashes, Transactions.Count);
+            if (TransactionHashes.Length > Transactions.Count)
+            {
+                Array.Resize(ref TransactionHashes, Transactions.Count);
+            }
 
             // Create valid request