fix: fix generic write int range check (#1861)

Author: Li2CO3

pkg/generic/thrift/write.go

@@ -21,6 +21,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"math"
 
 	"github.com/cloudwego/gopkg/protocol/thrift"
 	"github.com/cloudwego/gopkg/protocol/thrift/base"
@@ -339,7 +340,7 @@ func writeInt16(ctx context.Context, val interface{}, out *thrift.BufferWriter,
 	i := val.(int16)
 	switch t.Type {
 	case descriptor.I08:
-		if i&0xff != i {
+		if i < math.MinInt8 || i > math.MaxInt8 {
 			return fmt.Errorf("value is beyond range of i8: %v", i)
 		}
 		return out.WriteByte(int8(i))
@@ -358,12 +359,12 @@ func writeInt32(ctx context.Context, val interface{}, out *thrift.BufferWriter,
 	i := val.(int32)
 	switch t.Type {
 	case descriptor.I08:
-		if i&0xff != i {
+		if i < math.MinInt8 || i > math.MaxInt8 {
 			return fmt.Errorf("value is beyond range of i8: %v", i)
 		}
 		return out.WriteByte(int8(i))
 	case descriptor.I16:
-		if i&0xffff != i {
+		if i < math.MinInt16 || i > math.MaxInt16 {
 			return fmt.Errorf("value is beyond range of i16: %v", i)
 		}
 		return out.WriteI16(int16(i))
@@ -380,17 +381,17 @@ func writeInt64(ctx context.Context, val interface{}, out *thrift.BufferWriter,
 	i := val.(int64)
 	switch t.Type {
 	case descriptor.I08:
-		if i&0xff != i {
+		if i < math.MinInt8 || i > math.MaxInt8 {
 			return fmt.Errorf("value is beyond range of i8: %v", i)
 		}
 		return out.WriteByte(int8(i))
 	case descriptor.I16:
-		if i&0xffff != i {
+		if i < math.MinInt16 || i > math.MaxInt16 {
 			return fmt.Errorf("value is beyond range of i16: %v", i)
 		}
 		return out.WriteI16(int16(i))
 	case descriptor.I32:
-		if i&0xffffffff != i {
+		if i < math.MinInt32 || i > math.MaxInt32 {
 			return fmt.Errorf("value is beyond range of i32: %v", i)
 		}
 		return out.WriteI32(int32(i))

pkg/generic/thrift/write_test.go

@@ -107,6 +107,21 @@ func Test_nextWriter(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"nextWriteri64 Success",
+			args{
+				val: int64(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I64,
+					Struct: &descriptor.StructDescriptor{},
+				},
+				opt: &writerOption{
+					requestBase:      &base.Base{},
+					binaryWithBase64: false,
+				},
+			},
+			false,
+		},
 		{
 			"nextWriterbool Success",
 			args{
@@ -429,6 +444,17 @@ func Test_writeInt16(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"writeInt16toInt8 Negative Success",
+			args{
+				val: int16(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I08,
+					Struct: &descriptor.StructDescriptor{},
+				},
+			},
+			false,
+		},
 		{
 			"writeInt16toInt8 Failed",
 			args{
@@ -529,6 +555,17 @@ func Test_writeInt32(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"writeInt32ToInt8 Negative Success",
+			args{
+				val: int32(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I08,
+					Struct: &descriptor.StructDescriptor{},
+				},
+			},
+			false,
+		},
 		{
 			"writeInt32ToInt8 Failed",
 			args{
@@ -551,6 +588,17 @@ func Test_writeInt32(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"writeInt32ToInt16 Negative success",
+			args{
+				val: int32(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I16,
+					Struct: &descriptor.StructDescriptor{},
+				},
+			},
+			false,
+		},
 		{
 			"writeInt32ToInt16 Failed",
 			args{
@@ -628,6 +676,17 @@ func Test_writeInt64(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"writeInt64ToInt8 Negative Success",
+			args{
+				val: int64(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I08,
+					Struct: &descriptor.StructDescriptor{},
+				},
+			},
+			false,
+		},
 		{
 			"writeInt64ToInt8 failed",
 			args{
@@ -650,6 +709,17 @@ func Test_writeInt64(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"writeInt64ToInt16 Negative Success",
+			args{
+				val: int64(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I16,
+					Struct: &descriptor.StructDescriptor{},
+				},
+			},
+			false,
+		},
 		{
 			"writeInt64ToInt16 failed",
 			args{
@@ -672,6 +742,17 @@ func Test_writeInt64(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"writeInt64ToInt32 Negative Success",
+			args{
+				val: int64(-1),
+				t: &descriptor.TypeDescriptor{
+					Type:   descriptor.I32,
+					Struct: &descriptor.StructDescriptor{},
+				},
+			},
+			false,
+		},
 		{
 			"writeInt64ToInt32 failed",
 			args{