Skip to content

builtin: enforce MemoryBudget for split and splitAfter #938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thesmartshadow wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −8
Open

builtin: enforce MemoryBudget for split and splitAfter #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions builtin/builtin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,17 @@ var Builtins = []*Function{
},
{
Name: "split",
Func: func(args ...any) (any, error) {
Safe: func(args ...any) (any, uint, error) {
var parts []string
if len(args) == 2 {
return strings.Split(args[0].(string), args[1].(string)), nil
parts = strings.Split(args[0].(string), args[1].(string))
} else if len(args) == 3 {
return strings.SplitN(args[0].(string), args[1].(string), runtime.ToInt(args[2])), nil
parts = strings.SplitN(args[0].(string), args[1].(string), runtime.ToInt(args[2]))
} else {
return nil, fmt.Errorf("invalid number of arguments for split (expected 2 or 3, got %d)", len(args))
return nil, 0, fmt.Errorf("invalid number of arguments for split (expected 2 or 3, got %d)", len(args))
}
// Charge proportional to number of produced elements (slice growth + headers).
return parts, uint(len(parts)), nil
},
Types: types(
strings.Split,
Expand All @@ -279,14 +282,16 @@ var Builtins = []*Function{
},
{
Name: "splitAfter",
Func: func(args ...any) (any, error) {
Safe: func(args ...any) (any, uint, error) {
var parts []string
if len(args) == 2 {
return strings.SplitAfter(args[0].(string), args[1].(string)), nil
parts = strings.SplitAfter(args[0].(string), args[1].(string))
} else if len(args) == 3 {
return strings.SplitAfterN(args[0].(string), args[1].(string), runtime.ToInt(args[2])), nil
parts = strings.SplitAfterN(args[0].(string), args[1].(string), runtime.ToInt(args[2]))
} else {
return nil, fmt.Errorf("invalid number of arguments for splitAfter (expected 2 or 3, got %d)", len(args))
return nil, 0, fmt.Errorf("invalid number of arguments for splitAfter (expected 2 or 3, got %d)", len(args))
}
return parts, uint(len(parts)), nil
},
Types: types(
strings.SplitAfter,
Expand Down
32 changes: 32 additions & 0 deletions expr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3005,3 +3005,35 @@ func TestBytesLiteral_errors(t *testing.T) {
})
}
}

func TestMemoryBudget_SplitBuiltin(t *testing.T) {
type Env struct {
S string `expr:"s"`
}

in := Env{S: strings.Repeat("a", 200000)}

program, err := expr.Compile(`split(s, "a")`, expr.Env(Env{}))
require.NoError(t, err, "compile error")

m := vm.VM{MemoryBudget: 10}
_, err = m.Run(program, in)
require.Error(t, err, "expected memory budget error")
assert.Contains(t, err.Error(), "memory budget exceeded")
}

func TestMemoryBudget_SplitAfterBuiltin(t *testing.T) {
type Env struct {
S string `expr:"s"`
}

in := Env{S: strings.Repeat("a", 200000)}

program, err := expr.Compile(`splitAfter(s, "a")`, expr.Env(Env{}))
require.NoError(t, err, "compile error")

m := vm.VM{MemoryBudget: 10}
_, err = m.Run(program, in)
require.Error(t, err, "expected memory budget error")
assert.Contains(t, err.Error(), "memory budget exceeded")
}