forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accounts/abi: Index output for slices and arrays correctly

Browse source
This commit is contained in:
Jakob Borg 2016-11-18 11:13:09 +01:00
parent 2fab5dc246
commit 7470129121
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
accounts/abi/abi.go
View file

@ -274,12 +274,21 @@ func (abi ABI) Unpack(v interface{}, name string, output []byte) error {
// struct will match named return values to the struct's field // struct will match named return values to the struct's field
// names // names
case reflect.Struct: case reflect.Struct:
idx := 0
for i := 0; i < len(method.Outputs); i++ { for i := 0; i < len(method.Outputs); i++ {
marshalledValue, err := toGoType(i, method.Outputs[i], output) marshalledValue, err := toGoType(idx, method.Outputs[i], output)
if err != nil { if err != nil {
return err return err
} }
reflectValue := reflect.ValueOf(marshalledValue) reflectValue := reflect.ValueOf(marshalledValue)
kind := reflectValue.Type().Kind()
if (kind == reflect.Array || kind == reflect.Slice) &&
reflectValue.Type().Elem().Kind() != reflect.Uint8 {
// This is a slice of something other than bytes.
idx += reflectValue.Len()
} else {
idx++
}
for j := 0; j < typ.NumField(); j++ { for j := 0; j < typ.NumField(); j++ {
field := typ.Field(j) field := typ.Field(j)