Skip to content

starlark: add maxAlloc guard to list, sorted, enumerate #636

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
YuvalFradkin1 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −0
Open

starlark: add maxAlloc guard to list, sorted, enumerate #636

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
9 changes: 9 additions & 0 deletions starlark/library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ func enumerate(thread *Thread, _ *Builtin, args Tuple, kwargs []Tuple) (Value, e
var x Value

if n := Len(iterable); n >= 0 {
if uint(n) >= maxAlloc/2 {
return nil, fmt.Errorf("enumerate: argument too large (%d elements)", n)
}
// common case: known length
pairs = make([]Value, 0, n)
array := make(Tuple, 2*n) // allocate a single backing array
Expand Down Expand Up @@ -686,6 +689,9 @@ func list(thread *Thread, _ *Builtin, args Tuple, kwargs []Tuple) (Value, error)
iter := iterable.Iterate()
defer iter.Done()
if n := Len(iterable); n > 0 {
if uint(n) >= maxAlloc {
return nil, fmt.Errorf("list: argument too large (%d elements)", n)
}
elems = make([]Value, 0, n) // preallocate if length known
}
var x Value
Expand Down Expand Up @@ -1033,6 +1039,9 @@ func sorted(thread *Thread, _ *Builtin, args Tuple, kwargs []Tuple) (Value, erro
defer iter.Done()
var values []Value
if n := Len(iterable); n > 0 {
if uint(n) >= maxAlloc {
return nil, fmt.Errorf("sorted: argument too large (%d elements)", n)
}
values = make(Tuple, 0, n) // preallocate if length is known
}
var x Value
Expand Down
Loading