lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 00:07:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ensure int conversion correctness

Browse Source
This commit is contained in:
chrislu
2025-09-04 09:54:24 -07:00
parent 02d36637de
commit d572443c79
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed/query/engine/aggregations.go
View File

@@ -3,6 +3,7 @@ package engine
import (
"context"
"fmt"
"math"
"strconv"
"strings"
@@ -356,6 +357,9 @@ func (e *SQLEngine) executeAggregationQueryWithPlan(ctx context.Context, hybridS
if stmt.Limit != nil && stmt.Limit.Rowcount != nil {
if limitExpr, ok := stmt.Limit.Rowcount.(*SQLVal); ok && limitExpr.Type == IntVal {
if limit64, err := strconv.ParseInt(string(limitExpr.Val), 10, 64); err == nil {
if limit64 > int64(math.MaxInt) || limit64 < 0 {
return nil, fmt.Errorf("LIMIT value %d is out of range", limit64)
}
limit = int(limit64)
}
}
@@ -363,6 +367,9 @@ func (e *SQLEngine) executeAggregationQueryWithPlan(ctx context.Context, hybridS
if stmt.Limit != nil && stmt.Limit.Offset != nil {
if offsetExpr, ok := stmt.Limit.Offset.(*SQLVal); ok && offsetExpr.Type == IntVal {
if offset64, err := strconv.ParseInt(string(offsetExpr.Val), 10, 64); err == nil {
if offset64 > int64(math.MaxInt) || offset64 < 0 {
return nil, fmt.Errorf("OFFSET value %d is out of range", offset64)
}
offset = int(offset64)
}
}

29
weed/query/engine/string_functions.go
View File

@@ -147,11 +147,16 @@ func (e *SQLEngine) Substring(value *schema_pb.Value, start *schema_pb.Value, le
if lengthVal <= 0 {
result = ""
} else {
endIdx := startIdx + int(lengthVal)
if endIdx > len(str) {
endIdx = len(str)
if lengthVal > int64(math.MaxInt) {
// If length is too large, take substring from startIdx to end
result = str[startIdx:]
} else {
endIdx := startIdx + int(lengthVal)
if endIdx > len(str) {
endIdx = len(str)
}
result = str[startIdx:endIdx]
}
result = str[startIdx:endIdx]
}
} else {
result = str[startIdx:]
@@ -266,7 +271,13 @@ func (e *SQLEngine) Left(value *schema_pb.Value, length *schema_pb.Value) (*sche
}, nil
}
if lengthVal > int64(len(str)) || lengthVal > int64(math.MaxInt) {
if lengthVal > int64(len(str)) {
return &schema_pb.Value{
Kind: &schema_pb.Value_StringValue{StringValue: str},
}, nil
}
if lengthVal > int64(math.MaxInt) {
return &schema_pb.Value{
Kind: &schema_pb.Value_StringValue{StringValue: str},
}, nil
@@ -299,7 +310,13 @@ func (e *SQLEngine) Right(value *schema_pb.Value, length *schema_pb.Value) (*sch
}, nil
}
if lengthVal > int64(len(str)) || lengthVal > int64(math.MaxInt) {
if lengthVal > int64(len(str)) {
return &schema_pb.Value{
Kind: &schema_pb.Value_StringValue{StringValue: str},
}, nil
}
if lengthVal > int64(math.MaxInt) {
return &schema_pb.Value{
Kind: &schema_pb.Value_StringValue{StringValue: str},
}, nil