From: Rob Pike <r@golang.org>
Date: Sat, 31 Oct 2009 20:28:22 +0000 (-0700)
Subject: return "<nil>" when calling String() on a nil bytes.Buffer.
X-Git-Tag: weekly.2009-11-06~166
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=63e668d2ad97aa04d722af2d4f25db583ba12c34;p=gostls13.git

return "<nil>" when calling String() on a nil bytes.Buffer.

R=rsc
CC=go-dev
http://go/go-review/1016005
---

diff --git a/src/pkg/bytes/buffer.go b/src/pkg/bytes/buffer.go
index 7acddc4bcd..6e5887cb0b 100644
--- a/src/pkg/bytes/buffer.go
+++ b/src/pkg/bytes/buffer.go
@@ -42,8 +42,12 @@ func (b *Buffer) Bytes() []byte {
 }
 
 // String returns the contents of the unread portion of the buffer
-// as a string.
+// as a string.  If the Buffer is a nil pointer, it returns "<nil>".
 func (b *Buffer) String() string {
+	if b == nil {
+		// Special case, useful in debugging.
+		return "<nil>"
+	}
 	return string(b.buf[b.off : len(b.buf)]);
 }
 
diff --git a/src/pkg/bytes/buffer_test.go b/src/pkg/bytes/buffer_test.go
index f82c984685..c364eece4f 100644
--- a/src/pkg/bytes/buffer_test.go
+++ b/src/pkg/bytes/buffer_test.go
@@ -232,3 +232,11 @@ func TestMixedReadsAndWrites(t *testing.T) {
 	}
 	empty(t, "TestMixedReadsAndWrites (2)", &buf, s, make([]byte, buf.Len()));
 }
+
+
+func TestNil(t *testing.T) {
+	var b *Buffer;
+	if b.String() != "<nil>" {
+		t.Error("expcted <nil>; got %q", b.String());
+	}
+}