From 61cfbbd33fa28be2fe8810d24a49a12144fe101b Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Thu, 28 Jul 2022 16:57:11 +0300
Subject: [PATCH] Revert "vm/core: revert out-of-bounds script checks"

This reverts commit bd5644aa02315f4b8151805207ed0cb1eb047cab restoring changes
from #2538.
---
 pkg/core/native/management.go                  |  2 +-
 pkg/core/native/native_test/management_test.go | 12 ++----------
 pkg/vm/context.go                              |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkg/core/native/management.go b/pkg/core/native/management.go
index acb538500..888482095 100644
--- a/pkg/core/native/management.go
+++ b/pkg/core/native/management.go
@@ -640,7 +640,7 @@ func checkScriptAndMethods(script []byte, methods []manifest.Method) error {
 	offsets := bitfield.New(l)
 	for i := range methods {
 		if methods[i].Offset >= l {
-			continue
+			return fmt.Errorf("method %s/%d: offset is out of the script range", methods[i].Name, len(methods[i].Parameters))
 		}
 		offsets.Set(methods[i].Offset)
 	}
diff --git a/pkg/core/native/native_test/management_test.go b/pkg/core/native/native_test/management_test.go
index ce846a95e..dd64aeed5 100644
--- a/pkg/core/native/native_test/management_test.go
+++ b/pkg/core/native/native_test/management_test.go
@@ -136,19 +136,11 @@ func TestManagement_ContractDeploy(t *testing.T) {
 		badManifest := cs1.Manifest
 		badManifest.ABI.Methods = make([]manifest.Method, len(cs1.Manifest.ABI.Methods))
 		copy(badManifest.ABI.Methods, cs1.Manifest.ABI.Methods)
-		badManifest.ABI.Methods[0].Offset = 100500 // out of bounds, but it's OK, this method will not be checked then.
+		badManifest.ABI.Methods[0].Offset = 100500 // out of bounds
 		manifB, err := json.Marshal(&badManifest)
 		require.NoError(t, err)
 
-		tx := c.PrepareInvokeNoSign(t, "deploy", nefBytes, manifB)
-		tx.Signers = []transaction.Signer{{}} // Need dummy signer to deploy.
-		b := c.NewUnsignedBlock(t, tx)
-		ic := c.Chain.GetTestVM(trigger.Application, tx, b)
-		t.Cleanup(ic.Finalize)
-
-		ic.VM.LoadWithFlags(tx.Script, callflag.All)
-		err = ic.VM.Run()
-		require.NoError(t, err)
+		managementInvoker.InvokeFail(t, "method add/2: offset is out of the script range", "deploy", nefBytes, manifB)
 	})
 	t.Run("bad methods in manifest 2", func(t *testing.T) {
 		var badManifest = cs1.Manifest
diff --git a/pkg/vm/context.go b/pkg/vm/context.go
index e46356bf5..955554482 100644
--- a/pkg/vm/context.go
+++ b/pkg/vm/context.go
@@ -92,7 +92,7 @@ func (c *Context) NextIP() int {
 
 // Jump unconditionally moves the next instruction pointer to the specified location.
 func (c *Context) Jump(pos int) {
-	if pos < 0 || pos > len(c.prog) {
+	if pos < 0 || pos >= len(c.prog) {
 		panic("instruction offset is out of range")
 	}
 	c.nextip = pos