TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-01-07 19:50:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

vm: clear altstack on CALL, fix #1158

Browse source 
neo-vm doesn't copy altstack on CALL, so it effectively is cleared. But we
need to copy things back on return if there are any.
This commit is contained in:
Roman Khimov 2020-07-16 11:47:42 +03:00
parent 38c195fea9
commit 3d62db4f34
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/vm/vm.go
View file

@ -258,8 +258,9 @@ func (v *VM) Load(prog []byte) {
func (v *VM) LoadScript(b []byte) { func (v *VM) LoadScript(b []byte) {
ctx := NewContext(b) ctx := NewContext(b)
ctx.estack = v.estack ctx.estack = v.estack
ctx.astack = v.astack ctx.astack = v.newItemStack("alt")
v.istack.PushVal(ctx) v.istack.PushVal(ctx)
v.astack = ctx.astack
} }
// loadScriptWithHash if similar to the LoadScript method, but it also loads // loadScriptWithHash if similar to the LoadScript method, but it also loads
@ -1138,6 +1139,8 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
newCtx := ctx.Copy() newCtx := ctx.Copy()
newCtx.rvcount = -1 newCtx.rvcount = -1
newCtx.astack = v.newItemStack("alt")
v.astack = newCtx.astack
v.istack.PushVal(newCtx) v.istack.PushVal(newCtx)
offset := v.getJumpOffset(newCtx, parameter, 0) offset := v.getJumpOffset(newCtx, parameter, 0)
@ -1202,8 +1205,15 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
newEstack.Push(elem) newEstack.Push(elem)
} }
v.estack = newEstack v.estack = newEstack
v.astack = v.Context().astack
} }
newAstack := v.Context().astack
if rvcount == -1 && newAstack != oldCtx.astack {
for i := oldCtx.astack.Len(); i > 0; i-- {
elem := oldCtx.astack.RemoveAt(i - 1)
newAstack.Push(elem)
}
}
v.astack = newAstack
case opcode.CHECKSIG, opcode.VERIFY: case opcode.CHECKSIG, opcode.VERIFY:
var hashToCheck []byte var hashToCheck []byte