From: Robert Griesemer <gri@golang.org>
Date: Fri, 14 Nov 2008 23:13:29 +0000 (-0800)
Subject: buf fix: make FD.Read, FD.Write work for empty buffers
X-Git-Tag: weekly.2009-11-06~2724
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=23c8faaf856f7ee531c118a90efba2dbbe50eda2;p=gostls13.git

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

diff --git a/src/lib/os/os_file.go b/src/lib/os/os_file.go
index ee4deef72a..2667a1e212 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)
 }