aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

vm/core: revert out-of-bounds script checks

Browse source 
This reverts commits 1005c1f7db and
a5b5f88fe2 which are 3.4.0-compatible changes
while we need a 3.3.1-compatible release.
This commit is contained in:
Roman Khimov 2022-07-27 19:06:55 +03:00
parent 0ae8b635a1
commit bd5644aa02
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/core/native/management.go
View file

@ -640,7 +640,7 @@ func checkScriptAndMethods(script []byte, methods []manifest.Method) error {
offsets := bitfield.New(l) offsets := bitfield.New(l)
for i := range methods { for i := range methods {
if methods[i].Offset >= l { if methods[i].Offset >= l {
return fmt.Errorf("method %s/%d: offset is out of the script range", methods[i].Name, len(methods[i].Parameters)) continue
} }
offsets.Set(methods[i].Offset) offsets.Set(methods[i].Offset)
} }

12
pkg/core/native/native_test/management_test.go
View file

@ -136,11 +136,19 @@ func TestManagement_ContractDeploy(t *testing.T) {
badManifest := cs1.Manifest badManifest := cs1.Manifest
badManifest.ABI.Methods = make([]manifest.Method, len(cs1.Manifest.ABI.Methods)) badManifest.ABI.Methods = make([]manifest.Method, len(cs1.Manifest.ABI.Methods))
copy(badManifest.ABI.Methods, cs1.Manifest.ABI.Methods) copy(badManifest.ABI.Methods, cs1.Manifest.ABI.Methods)
badManifest.ABI.Methods[0].Offset = 100500 // out of bounds badManifest.ABI.Methods[0].Offset = 100500 // out of bounds, but it's OK, this method will not be checked then.
manifB, err := json.Marshal(&badManifest) manifB, err := json.Marshal(&badManifest)
require.NoError(t, err) require.NoError(t, err)
managementInvoker.InvokeFail(t, "method add/2: offset is out of the script range", "deploy", nefBytes, manifB) 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)
}) })
t.Run("bad methods in manifest 2", func(t *testing.T) { t.Run("bad methods in manifest 2", func(t *testing.T) {
var badManifest = cs1.Manifest var badManifest = cs1.Manifest

2
pkg/vm/context.go
View file

@ -92,7 +92,7 @@ func (c *Context) NextIP() int {
// Jump unconditionally moves the next instruction pointer to the specified location. // Jump unconditionally moves the next instruction pointer to the specified location.
func (c *Context) Jump(pos int) { 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") panic("instruction offset is out of range")
} }
c.nextip = pos c.nextip = pos