Handle ArrayPool arrays more safely

NethermindEth · Jul 3, 2024 · 486e619 · 486e619
1 parent a815169
commit 486e619
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 159 deletions.
diff --git a/src/Nethermind/Nethermind.Evm.Test/InvalidOpcodeTests.cs b/src/Nethermind/Nethermind.Evm.Test/InvalidOpcodeTests.cs
@@ -195,9 +195,9 @@ public void Test(long blockNumber, ulong? timestamp = null)
 
                 byte[] code = Prepare.EvmCode
                         .Op((byte)i)
-                        .Done; ;
+                        .Done;
 
-                if (InstructionExtensions.IsValid(opcode, true) && !InstructionExtensions.IsValid(opcode, false))
+                if (InstructionExtensions.IsValid(opcode, IsEofContext: true) && !InstructionExtensions.IsValid(opcode, IsEofContext: false))
                 {
                     var opcodeMetadata = InstructionExtensions.StackRequirements(opcode);
                     opcodeMetadata.InputCount ??= 1;

diff --git a/src/Nethermind/Nethermind.Evm/BitmapHelper.cs b/src/Nethermind/Nethermind.Evm/BitmapHelper.cs
@@ -39,7 +39,7 @@ public static byte[] CreateCodeBitmap(ReadOnlySpan<byte> code, bool isEof = fals
         return bitvec;
     }
 
-    public static void HandleNumbits(int numbits, byte[] bitvec, scoped ref int pc)
+    public static void HandleNumbits(int numbits, Span<byte> bitvec, scoped ref int pc)
     {
         if (numbits >= 8)
         {
@@ -72,17 +72,17 @@ public static void HandleNumbits(int numbits, byte[] bitvec, scoped ref int pc)
     /// <summary>
     /// Checks if the position is in a code segment.
     /// </summary>
-    public static bool IsCodeSegment(byte[] bitvec, int pos)
+    public static bool IsCodeSegment(Span<byte> bitvec, int pos)
     {
         return (bitvec[pos / 8] & (0x80 >> (pos % 8))) == 0;
     }
 
-    private static void Set1(this byte[] bitvec, int pos)
+    private static void Set1(this Span<byte> bitvec, int pos)
     {
         bitvec[pos / 8] |= _lookup[pos % 8];
     }
 
-    private static void SetN(this byte[] bitvec, int pos, UInt16 flag)
+    private static void SetN(this Span<byte> bitvec, int pos, UInt16 flag)
     {
         ushort a = (ushort)(flag >> (pos % 8));
         bitvec[pos / 8] |= (byte)(a >> 8);
@@ -95,14 +95,14 @@ private static void SetN(this byte[] bitvec, int pos, UInt16 flag)
         }
     }
 
-    private static void Set8(this byte[] bitvec, int pos)
+    private static void Set8(this Span<byte> bitvec, int pos)
     {
         byte a = (byte)(0xFF >> (pos % 8));
         bitvec[pos / 8] |= a;
         bitvec[pos / 8 + 1] = (byte)~a;
     }
 
-    private static void Set16(this byte[] bitvec, int pos)
+    private static void Set16(this Span<byte> bitvec, int pos)
     {
         byte a = (byte)(0xFF >> (pos % 8));
         bitvec[pos / 8] |= a;

diff --git a/src/Nethermind/Nethermind.Evm/EvmObjectFormat/EofCodeInfo.cs b/src/Nethermind/Nethermind.Evm/EvmObjectFormat/EofCodeInfo.cs
@@ -5,7 +5,6 @@
 using Nethermind.Core.Extensions;
 using Nethermind.Evm.EOF;
 using Nethermind.Evm.Precompiles;
-using static System.Collections.Specialized.BitVector32;
 
 namespace Nethermind.Evm.CodeAnalysis;