go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #882 from DarcySail:darcy_faster_CopyStringIn 

PiperOrigin-RevId: 271675009
This commit is contained in:
gVisor bot 2019-09-27 17:27:13 -07:00
parent c8bb20865d d72c63664b
commit eebc38be7a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/sentry/usermem/usermem.go
View File

@ -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 {
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