Ensure UIntX length (#2655)

* Ensure length * Fix UT and change to FormatException
neo-project · Jan 28, 2022 · 1e44918 · 1e44918
1 parent abd53e8
commit 1e44918
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/src/neo/UInt160.cs b/src/neo/UInt160.cs
@@ -51,6 +51,7 @@ public UInt160()
         /// <param name="value">The value of the <see cref="UInt160"/>.</param>
         public unsafe UInt160(ReadOnlySpan<byte> value)
         {
+            if (value.Length != Length) throw new FormatException();
             fixed (ulong* p = &value1)
             {
                 Span<byte> dst = new(p, Length);

diff --git a/src/neo/UInt256.cs b/src/neo/UInt256.cs
@@ -52,6 +52,7 @@ public UInt256()
         /// <param name="value">The value of the <see cref="UInt256"/>.</param>
         public unsafe UInt256(ReadOnlySpan<byte> value)
         {
+            if (value.Length != Length) throw new FormatException();
             fixed (ulong* p = &value1)
             {
                 Span<byte> dst = new(p, Length);

diff --git a/tests/neo.UnitTests/SmartContract/Native/UT_GasToken.cs b/tests/neo.UnitTests/SmartContract/Native/UT_GasToken.cs
@@ -119,8 +119,8 @@ await Assert.ThrowsExceptionAsync<InvalidOperationException>(async () =>
             // Bad inputs
 
             Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.GAS.Transfer(snapshot, from, to, BigInteger.MinusOne, true, persistingBlock));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.GAS.Transfer(snapshot, new byte[19], to, BigInteger.One, false, persistingBlock));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.GAS.Transfer(snapshot, from, new byte[19], BigInteger.One, false, persistingBlock));
+            Assert.ThrowsException<FormatException>(() => NativeContract.GAS.Transfer(snapshot, new byte[19], to, BigInteger.One, false, persistingBlock));
+            Assert.ThrowsException<FormatException>(() => NativeContract.GAS.Transfer(snapshot, from, new byte[19], BigInteger.One, false, persistingBlock));
         }
 
         internal static StorageKey CreateStorageKey(byte prefix, uint key)

diff --git a/tests/neo.UnitTests/SmartContract/Native/UT_NeoToken.cs b/tests/neo.UnitTests/SmartContract/Native/UT_NeoToken.cs
@@ -400,8 +400,8 @@ public void Check_Transfer()
             // Bad inputs
 
             Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.NEO.Transfer(snapshot, from, to, BigInteger.MinusOne, true, persistingBlock));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.NEO.Transfer(snapshot, new byte[19], to, BigInteger.One, false, persistingBlock));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.NEO.Transfer(snapshot, from, new byte[19], BigInteger.One, false, persistingBlock));
+            Assert.ThrowsException<FormatException>(() => NativeContract.NEO.Transfer(snapshot, new byte[19], to, BigInteger.One, false, persistingBlock));
+            Assert.ThrowsException<FormatException>(() => NativeContract.NEO.Transfer(snapshot, from, new byte[19], BigInteger.One, false, persistingBlock));
 
             // More than balance
 

diff --git a/tests/neo.UnitTests/SmartContract/UT_InteropService.cs b/tests/neo.UnitTests/SmartContract/UT_InteropService.cs
@@ -324,9 +324,7 @@ public void TestBlockchain_GetBlock()
                                         0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
                                         0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
             NativeContract.Ledger.GetBlock(engine.Snapshot, new UInt256(data1)).Should().BeNull();
-
-            byte[] data2 = new byte[] { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 };
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => NativeContract.Ledger.GetBlock(engine.Snapshot, new UInt256(data2)));
+            NativeContract.Ledger.GetBlock(engine.Snapshot, TestBlockchain.TheNeoSystem.GenesisBlock.Hash).Should().NotBeNull();
         }
 
         [TestMethod]

diff --git a/tests/neo.UnitTests/UT_UInt160.cs b/tests/neo.UnitTests/UT_UInt160.cs
@@ -9,6 +9,12 @@ namespace Neo.UnitTests.IO
     [TestClass]
     public class UT_UInt160
     {
+        [TestMethod]
+        public void TestFail()
+        {
+            Assert.ThrowsException<FormatException>(() => new UInt160(new byte[UInt160.Length + 1]));
+        }
+
         [TestMethod]
         public void TestGernerator1()
         {

diff --git a/tests/neo.UnitTests/UT_UInt256.cs b/tests/neo.UnitTests/UT_UInt256.cs
@@ -11,6 +11,12 @@ namespace Neo.UnitTests.IO
     [TestClass]
     public class UT_UInt256
     {
+        [TestMethod]
+        public void TestFail()
+        {
+            Assert.ThrowsException<FormatException>(() => new UInt256(new byte[UInt256.Length + 1]));
+        }
+
         [TestMethod]
         public void TestGernerator1()
         {