dev: chg: fix size allocation checks

maticnetwork · Oct 10, 2023 · a50c10d · a50c10d
1 parent e5d77fe
commit a50c10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go
@@ -25,6 +25,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/accounts"
@@ -308,9 +309,7 @@ func (w *trezorDriver) trezorExchange(req proto.Message, results ...proto.Messag
 
 	var payload []byte
 
-	if 8+len(data) > 64*1024*1024 {
-		payload = make([]byte, 0)
-	} else {
+	if 8+len(data) < math.MaxInt {
 		payload = make([]byte, 8+len(data))
 	}
 

diff --git a/core/vm/contract.go b/core/vm/contract.go
@@ -147,11 +147,8 @@ func (c *Contract) AsDelegate() *Contract {
 
 // GetOp returns the n'th element in the contract's byte array
 func (c *Contract) GetOp(n uint64) OpCode {
-	if n > 0 && n <= math.MaxUint16 {
-		if n < uint64(len(c.Code)) {
+	if len(c.Code) > 0 && len(c.Code) <= math.MaxUint16 && n < uint64(len(c.Code)) {
 			return OpCode(c.Code[n])
-		}
-
 	}
 
 	return STOP