Fault when init with 0

neo-project · Dec 14, 2019 · 9e76e51 · 9e76e51
1 parent 0c22b69
commit 9e76e51
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/neo-vm/ExecutionEngine.cs b/src/neo-vm/ExecutionEngine.cs
@@ -432,13 +432,14 @@ private bool ExecuteInstruction()
                 case OpCode.INITSSLOT:
                     {
                         if (context.StaticFields != null) return false;
-                        if (instruction.TokenU8 == 0) break;
+                        if (instruction.TokenU8 == 0) return false;
                         context.StaticFields = new Slot(instruction.TokenU8, ReferenceCounter);
                         break;
                     }
                 case OpCode.INITSLOT:
                     {
                         if (context.LocalVariables != null || context.Arguments != null) return false;
+                        if (instruction.TokenU16 == 0) return false;
                         if (instruction.TokenU8 > 0)
                         {
                             context.LocalVariables = new Slot(instruction.TokenU8, ReferenceCounter);

diff --git a/src/neo-vm/Instruction.cs b/src/neo-vm/Instruction.cs
@@ -66,6 +66,15 @@ public string TokenString
             }
         }
 
+        public ushort TokenU16
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+                return BinaryPrimitives.ReadUInt16LittleEndian(Operand.Span);
+            }
+        }
+
         public uint TokenU32
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]