forked from TrueCloudLab/neoneo-go
Revert "vm/core: revert out-of-bounds script checks"
This reverts commit bd5644aa02
restoring changes
from #2538.
This commit is contained in:
parent
55f910777e
commit
61cfbbd33f
3 changed files with 4 additions and 12 deletions
|
@ -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 {
|
||||||
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)
|
offsets.Set(methods[i].Offset)
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,19 +136,11 @@ 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, 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)
|
manifB, err := json.Marshal(&badManifest)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
tx := c.PrepareInvokeNoSign(t, "deploy", nefBytes, manifB)
|
managementInvoker.InvokeFail(t, "method add/2: offset is out of the script range", "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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue