TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #496 from nspcc-dev/fix/serialize

Browse source 
vm: fix a bug in collection serialize
This commit is contained in:
Roman Khimov 2019-11-15 16:03:41 +03:00 committed by GitHub
commit 9134cc1c37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/vm/serialization.go
View file

@ -33,7 +33,6 @@ func serializeItemTo(item StackItem, w *io.BinWriter, seen map[StackItem]bool) {
w.Err = errors.New("recursive structures are not supported") w.Err = errors.New("recursive structures are not supported")
return return
} }
seen[item] = true
switch t := item.(type) { switch t := item.(type) {
case *ByteArrayItem: case *ByteArrayItem:
@ -48,6 +47,8 @@ func serializeItemTo(item StackItem, w *io.BinWriter, seen map[StackItem]bool) {
case *InteropItem: case *InteropItem:
w.Err = errors.New("not supported") w.Err = errors.New("not supported")
case *ArrayItem, *StructItem: case *ArrayItem, *StructItem:
seen[item] = true
_, isArray := t.(*ArrayItem) _, isArray := t.(*ArrayItem)
if isArray { if isArray {
w.WriteLE(byte(arrayT)) w.WriteLE(byte(arrayT))
@ -61,6 +62,8 @@ func serializeItemTo(item StackItem, w *io.BinWriter, seen map[StackItem]bool) {
serializeItemTo(arr[i], w, seen) serializeItemTo(arr[i], w, seen)
} }
case *MapItem: case *MapItem:
seen[item] = true
w.WriteLE(byte(mapT)) w.WriteLE(byte(mapT))
w.WriteVarUint(uint64(len(t.value))) w.WriteVarUint(uint64(len(t.value)))
for k, v := range t.value { for k, v := range t.value {

11
pkg/vm/vm_test.go
View file

@ -379,6 +379,17 @@ func TestSerializeArrayBad(t *testing.T) {
require.True(t, vm.HasFailed()) require.True(t, vm.HasFailed())
} }
func TestSerializeDupInteger(t *testing.T) {
prog := []byte{
byte(PUSH0), byte(NEWARRAY),
byte(DUP), byte(PUSH2), byte(DUP), byte(TOALTSTACK), byte(APPEND),
byte(DUP), byte(FROMALTSTACK), byte(APPEND),
}
vm := load(append(prog, getSerializeProg()...))
runVM(t, vm)
}
func TestSerializeStruct(t *testing.T) { func TestSerializeStruct(t *testing.T) {
vm := load(getSerializeProg()) vm := load(getSerializeProg())
item := NewStructItem([]StackItem{ item := NewStructItem([]StackItem{