From 23c8faaf856f7ee531c118a90efba2dbbe50eda2 Mon Sep 17 00:00:00 2001
From: Robert Griesemer <gri@golang.org>
Date: Fri, 14 Nov 2008 15:13:29 -0800
Subject: [PATCH] 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
---
src/lib/os/os_file.go | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/os/os_file.go b/src/lib/os/os_file.go
index ee4deef72a7..2667a1e2129 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)
}
--
GitLab