apply strict enum checking (neo-project#1254)

Tommo-L · Jun 22, 2020 · 1c326ca · 1c326ca
1 parent 0be3125
commit 1c326ca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/neo/Consensus/ConsensusMessage.cs b/src/neo/Consensus/ConsensusMessage.cs
@@ -14,6 +14,8 @@ public abstract class ConsensusMessage : ISerializable
 
         protected ConsensusMessage(ConsensusMessageType type)
         {
+            if (!Enum.IsDefined(typeof(ConsensusMessageType), type))
+                throw new ArgumentOutOfRangeException(nameof(type));
             this.Type = type;
         }
 

diff --git a/src/neo/Network/P2P/Payloads/TransactionAttribute.cs b/src/neo/Network/P2P/Payloads/TransactionAttribute.cs
@@ -37,7 +37,9 @@ public JObject ToJson()
         public static TransactionAttribute FromJson(JObject json)
         {
             TransactionAttribute transactionAttribute = new TransactionAttribute();
-            transactionAttribute.Usage = (TransactionAttributeUsage)(byte.Parse(json["usage"].AsString()));
+            transactionAttribute.Usage = (TransactionAttributeUsage)byte.Parse(json["usage"].AsString());
+            if (!Enum.IsDefined(typeof(TransactionAttributeUsage), transactionAttribute.Usage))
+                throw new ArgumentException();
             transactionAttribute.Data = Convert.FromBase64String(json["data"].AsString());
             return transactionAttribute;
         }

diff --git a/src/neo/Wallets/SQLite/VerificationContract.cs b/src/neo/Wallets/SQLite/VerificationContract.cs
@@ -14,7 +14,13 @@ public class VerificationContract : SmartContract.Contract, IEquatable<Verificat
         public void Deserialize(BinaryReader reader)
         {
             reader.ReadSerializable<UInt160>();
-            ParameterList = reader.ReadVarBytes().Select(p => (ContractParameterType)p).ToArray();
+            ParameterList = reader.ReadVarBytes().Select(p =>
+            {
+                var ret = (ContractParameterType)p;
+                if (!Enum.IsDefined(typeof(ContractParameterType), ret))
+                    throw new FormatException();
+                return ret;
+            }).ToArray();
             Script = reader.ReadVarBytes();
         }