suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-01 01:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge af6b4f38b9 into e95bb7e472

Browse Source
This commit is contained in:
Rayan Salhab 2026-06-23 16:12:27 -06:00 committed by GitHub
commit 7fa82120a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/yqlib/operator_multiply.go
View File

@ -150,17 +150,25 @@ func repeatString(lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error
target := lhs.CopyWithoutContent()
target.UpdateAttributesFrom(stringNode, assignPreferences{})
count, err := parseInt(intNode.Value)
_, count, err := parseInt64(intNode.Value)
if err != nil {
return nil, err
} else if count < 0 {
return nil, fmt.Errorf("cannot repeat string by a negative number (%v)", count)
}
maxResultLen := 10 * 1024 * 1024 // 10 MiB
if count > 0 && len(stringNode.Value) > maxResultLen/count {
if stringNode.Value == "" {
target.Value = ""
return target, nil
}
maxResultLen := int64(10 * 1024 * 1024) // 10 MiB
if count > 0 && int64(len(stringNode.Value)) > maxResultLen/count {
return nil, fmt.Errorf("result of repeating string (%v bytes) by %v would exceed %v bytes", len(stringNode.Value), count, maxResultLen)
}
target.Value = strings.Repeat(stringNode.Value, count)
repeatCount, err := parseInt(intNode.Value)
if err != nil {
return nil, err
}
target.Value = strings.Repeat(stringNode.Value, repeatCount)
return target, nil
}

10
pkg/yqlib/operator_multiply_test.go
View File

@ -2,7 +2,6 @@ package yqlib
import (
"fmt"
"math/bits"
"strings"
"testing"
)
@ -709,12 +708,11 @@ var multiplyOperatorScenarios = []expressionScenario{
},
{
// Pick a count whose product with len("ab") overflows int on
// any architecture: 2^30 on 32-bit, 2^62 on 64-bit. Doubling
// either yields MaxInt+1, which wraps to MinInt and bypasses
// a naive len*count guard.
// 64-bit architectures; it must still report the repeat size
// limit on 32-bit architectures instead of an int range error.
skipDoc: true,
expression: fmt.Sprintf(`"ab" * %d`, 1<<(bits.UintSize-2)),
expectedError: fmt.Sprintf("result of repeating string (2 bytes) by %d would exceed 10485760 bytes", 1<<(bits.UintSize-2)),
expression: fmt.Sprintf(`"ab" * %d`, int64(1)<<62),
expectedError: fmt.Sprintf("result of repeating string (2 bytes) by %d would exceed 10485760 bytes", int64(1)<<62),
},
}