interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abi: fix missing method on go 1.7/1.8

This commit is contained in:
Martin Holst Swende 2018-02-02 14:03:58 +01:00
parent bd6ed23899
commit 61f2279bde
No known key found for this signature in database
GPG Key ID: 683B438C05A5DDF0
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
accounts/abi/unpack.go
View File

@ -184,22 +184,32 @@ func toGoType(index int, t Type, output []byte) (interface{}, error) {
// interprets a 32 byte slice as an offset and then determines which indice to look to decode the type. // interprets a 32 byte slice as an offset and then determines which indice to look to decode the type.
func lengthPrefixPointsTo(index int, output []byte) (start int, length int, err error) { func lengthPrefixPointsTo(index int, output []byte) (start int, length int, err error) {
offsetBig := big.NewInt(0).SetBytes(output[index : index+32]) bigOffsetEnd := big.NewInt(0).SetBytes(output[index : index+32])
if !offsetBig.IsInt64() { bigOffsetEnd.Add(bigOffsetEnd, common.Big32)
return 0, 0, fmt.Errorf("abi offset larger than int64: %v", offsetBig) outputLength := big.NewInt(int64(len(output)))
if bigOffsetEnd.Cmp(outputLength) > 0 {
return 0, 0, fmt.Errorf("abi: cannot marshal in to go slice: offset %v would go over slice boundary (len=%v)", bigOffsetEnd, outputLength)
} }
offset := int(offsetBig.Int64())
if offset+32 > len(output) { if bigOffsetEnd.BitLen() > 63 {
return 0, 0, fmt.Errorf("abi: cannot marshal in to go slice: offset %d would go over slice boundary (len=%d)", len(output), offset+32) return 0, 0, fmt.Errorf("abi offset larger than int64: %v", bigOffsetEnd)
} }
lengthBig := big.NewInt(0).SetBytes(output[offset : offset+32])
if !lengthBig.IsInt64() { offsetEnd := int(bigOffsetEnd.Uint64())
return 0, 0, fmt.Errorf("abi length larger than int64: %v", lengthBig) lengthBig := big.NewInt(0).SetBytes(output[offsetEnd-32 : offsetEnd])
totalSize := big.NewInt(0)
totalSize.Add(totalSize, bigOffsetEnd)
totalSize.Add(totalSize, lengthBig)
if totalSize.BitLen() > 63 {
return 0, 0, fmt.Errorf("abi length larger than int64: %v", totalSize)
} }
length = int(lengthBig.Int64())
if offset+32+length > len(output) { if totalSize.Cmp(outputLength) > 0 {
return 0, 0, fmt.Errorf("abi: cannot marshal in to go type: length insufficient %d require %d", len(output), offset+32+length) return 0, 0, fmt.Errorf("abi: cannot marshal in to go type: length insufficient %v require %v", outputLength, totalSize)
} }
start = offset + 32 start = int(bigOffsetEnd.Uint64())
length = int(lengthBig.Uint64())
return return
} }