Skip to content
This repository was archived by the owner on May 13, 2022. It is now read-only.

Commit 7e34d6b

Browse files
author
Silas Davis
authored
Merge branch 'master' into dependabot/npm_and_yarn/js/highlight.js-9.18.5
2 parents 3ffa0c3 + 420a445 commit 7e34d6b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

execution/evm/abi/primitives.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,9 @@ func (e EVMAddress) pack(v interface{}) ([]byte, error) {
539539
}
540540

541541
func (e EVMAddress) unpack(data []byte, offset int, v interface{}) (int, error) {
542+
if len(data)-offset < ElementSize {
543+
return 0, fmt.Errorf("%v: not enough data", e)
544+
}
542545
addr, err := crypto.AddressFromBytes(data[offset+ElementSize-crypto.AddressLength : offset+ElementSize])
543546
if err != nil {
544547
return 0, err
@@ -618,6 +621,9 @@ func (e EVMBytes) pack(v interface{}) ([]byte, error) {
618621
}
619622

620623
func (e EVMBytes) unpack(data []byte, offset int, v interface{}) (int, error) {
624+
if len(data)-offset < ElementSize {
625+
return 0, fmt.Errorf("%v: not enough data", e)
626+
}
621627
if e.M == 0 {
622628
s := EVMString{}
623629

0 commit comments

Comments
 (0)