diff options
| author | Andrei Vagin <avagin@google.com> | 2019-10-02 13:00:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 13:00:07 -0700 |
| commit | 9a875306dbabcf335a2abccc08119a1b67d0e51a (patch) | |
| tree | 0f72c12e951a5eee7156df7a5d63351bc89befa6 /pkg/sentry/usermem | |
| parent | 38bc0b6b6addd25ceec4f66ef1af41c1e61e2985 (diff) | |
| parent | 03ce4dd86c9acd6b6148f68d5d2cf025d8c254bb (diff) | |
Merge branch 'master' into pr_syscall_linux
Diffstat (limited to 'pkg/sentry/usermem')
| -rw-r--r-- | pkg/sentry/usermem/BUILD | 4 | ||||
| -rw-r--r-- | pkg/sentry/usermem/usermem.go | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkg/sentry/usermem/BUILD b/pkg/sentry/usermem/BUILD index a5b4206bb..cc5d25762 100644 --- a/pkg/sentry/usermem/BUILD +++ b/pkg/sentry/usermem/BUILD @@ -1,7 +1,9 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_test") + package(licenses = ["notice"]) load("//tools/go_generics:defs.bzl", "go_template_instance") -load("//tools/go_stateify:defs.bzl", "go_library", "go_test") +load("//tools/go_stateify:defs.bzl", "go_library") go_template_instance( name = "addr_range", diff --git a/pkg/sentry/usermem/usermem.go b/pkg/sentry/usermem/usermem.go index 6eced660a..7b1f312b1 100644 --- a/pkg/sentry/usermem/usermem.go +++ b/pkg/sentry/usermem/usermem.go @@ -16,6 +16,7 @@ package usermem import ( + "bytes" "errors" "io" "strconv" @@ -270,11 +271,10 @@ func CopyStringIn(ctx context.Context, uio IO, addr Addr, maxlen int, opts IOOpt n, err := uio.CopyIn(ctx, addr, buf[done:done+readlen], opts) // Look for the terminating zero byte, which may have occurred before // hitting err. - for i, c := range buf[done : done+n] { - if c == 0 { - return stringFromImmutableBytes(buf[:done+i]), nil - } + if i := bytes.IndexByte(buf[done:done+n], byte(0)); i >= 0 { + return stringFromImmutableBytes(buf[:done+i]), nil } + done += n if err != nil { return stringFromImmutableBytes(buf[:done]), err |