gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accounts/abi: update array length after parsing array (#15618)

Browse Source 
Fixes #15617
This commit is contained in:
Dmitry Shulyak
2017-12-20 16:09:23 +02:00
committed by Felix Lange
parent ce823c9f84
commit da58afcea0
4 changed files with 78 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
accounts/abi/method.go
View File

@ -95,14 +95,15 @@ func (method Method) tupleUnpack(v interface{}, output []byte) error {
j := 0
for i := 0; i < len(method.Outputs); i++ {
toUnpack := method.Outputs[i]
if toUnpack.Type.T == ArrayTy {
// need to move this up because they read sequentially
j += toUnpack.Type.Size
}
marshalledValue, err := toGoType((i+j)*32, toUnpack.Type, output)
if err != nil {
return err
}
if toUnpack.Type.T == ArrayTy {
// combined index ('i' + 'j') need to be adjusted only by size of array, thus
// we need to decrement 'j' because 'i' was incremented
j += toUnpack.Type.Size - 1
}
reflectValue := reflect.ValueOf(marshalledValue)
switch value.Kind() {