diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-09-27 17:27:13 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-09-27 17:27:13 -0700 |
| commit | eebc38be7a0de0ea7ae84e48949c1a94b3284b7e (patch) | |
| tree | 5e592735b2216c3ce93a8587444b1233c0e5ed9c | |
| parent | c8bb20865d5f2b391b670b391d72e574002363e3 (diff) | |
| parent | d72c63664b46af52f4880a2a015666a52deb0749 (diff) | |
Merge pull request #882 from DarcySail:darcy_faster_CopyStringIn
PiperOrigin-RevId: 271675009
| -rw-r--r-- | pkg/sentry/usermem/usermem.go | 8 |
1 files changed, 4 insertions, 4 deletions
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 |