Merge pull request #6258 from filecoin-project/fix/index-too-large

fix: index too large may out of range
filecoin-project · Jan 10, 2024 · d18cba6 · d18cba6
2 parents bc5ddbc + 00c1abe
commit d18cba6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/net/exchange/client.go b/pkg/net/exchange/client.go
@@ -276,14 +276,14 @@ func (c *client) validateCompressedIndices(chain []*exchange.BSTipSet) error {
 
 		for blockIdx := 0; blockIdx < blocksNum; blockIdx++ {
 			for _, mi := range msgs.BlsIncludes[blockIdx] {
-				if int(mi) >= len(msgs.Bls) {
+				if mi >= uint64(len(msgs.Bls)) {
 					return fmt.Errorf("index in BlsIncludes (%d) exceeds number of messages (%d)",
 						mi, len(msgs.Bls))
 				}
 			}
 
 			for _, mi := range msgs.SecpkIncludes[blockIdx] {
-				if int(mi) >= len(msgs.Secpk) {
+				if mi >= uint64(len(msgs.Secpk)) {
 					return fmt.Errorf("index in SecpkIncludes (%d) exceeds number of messages (%d)",
 						mi, len(msgs.Secpk))
 				}

diff --git a/venus-component/libp2p/exchange/client/client.go b/venus-component/libp2p/exchange/client/client.go
@@ -281,14 +281,14 @@ func (c *client) validateCompressedIndices(chain []*exchange.BSTipSet) error {
 
 		for blockIdx := 0; blockIdx < blocksNum; blockIdx++ {
 			for _, mi := range msgs.BlsIncludes[blockIdx] {
-				if int(mi) >= len(msgs.Bls) {
+				if mi >= uint64(len(msgs.Bls)) {
 					return fmt.Errorf("index in BlsIncludes (%d) exceeds number of messages (%d)",
 						mi, len(msgs.Bls))
 				}
 			}
 
 			for _, mi := range msgs.SecpkIncludes[blockIdx] {
-				if int(mi) >= len(msgs.Secpk) {
+				if mi >= uint64(len(msgs.Secpk)) {
 					return fmt.Errorf("index in SecpkIncludes (%d) exceeds number of messages (%d)",
 						mi, len(msgs.Secpk))
 				}