summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2008-11-14 15:13:29 -0800
committerRobert Griesemer <gri@golang.org>2008-11-14 15:13:29 -0800
commitd96e30c328d189da4b8158a45fdbce64b1532836 (patch)
treecb7baf6e170a764a2c72f79a9415d43b9975db8f /src
parent5afa9b759a04e77c3d37aff030e400dafc1587b3 (diff)
downloadgolang-d96e30c328d189da4b8158a45fdbce64b1532836.tar.gz
buf fix: make FD.Read, FD.Write work for empty buffers
R=r DELTA=8 (6 added, 0 deleted, 2 changed) OCL=19273 CL=19275
Diffstat (limited to 'src')
-rw-r--r--src/lib/os/os_file.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/os/os_file.go b/src/lib/os/os_file.go
index ee4deef72..2667a1e21 100644
--- a/src/lib/os/os_file.go
+++ b/src/lib/os/os_file.go
@@ -57,7 +57,10 @@ func (fd *FD) Read(b *[]byte) (ret int, err *Error) {
if fd == nil {
return -1, EINVAL
}
- r, e := syscall.read(fd.fd, &b[0], int64(len(b)));
+ var r, e int64;
+ if len(b) > 0 { // because we access b[0]
+ r, e = syscall.read(fd.fd, &b[0], int64(len(b)));
+ }
return int(r), ErrnoToError(e)
}
@@ -65,7 +68,10 @@ func (fd *FD) Write(b *[]byte) (ret int, err *Error) {
if fd == nil {
return -1, EINVAL
}
- r, e := syscall.write(fd.fd, &b[0], int64(len(b)));
+ var r, e int64;
+ if len(b) > 0 { // because we access b[0]
+ r, e = syscall.write(fd.fd, &b[0], int64(len(b)));
+ }
return int(r), ErrnoToError(e)
}