From: Dave Cheney <dave@cheney.net>
Date: Wed, 16 Nov 2011 15:19:56 +0000 (-0500)
Subject: exp/ssh: fix unmarshal test
X-Git-Tag: weekly.2011-11-18~37
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=00f9b7680a8481e988b20414699fb25b0030079b;p=gostls13.git

exp/ssh: fix unmarshal test

Ensure that empty NameLists always return
a zero length []string, not nil.

In practice NameLists are only used in a few
message types and always consumed by a for
range function so the difference between nil
and []string{} is not significant.

Also, add exp/ssh to pkg/Makefile as suggested
by rsc.

R=rsc, agl
CC=golang-dev
https://golang.org/cl/5400042
---

diff --git a/src/pkg/exp/ssh/messages.go b/src/pkg/exp/ssh/messages.go
index e24b6398b5..169a8bf6b8 100644
--- a/src/pkg/exp/ssh/messages.go
+++ b/src/pkg/exp/ssh/messages.go
@@ -392,7 +392,10 @@ func parseString(in []byte) (out, rest []byte, ok bool) {
 	return
 }
 
-var comma = []byte{','}
+var (
+	comma         = []byte{','}
+	emptyNameList = []string{}
+)
 
 func parseNameList(in []byte) (out []string, rest []byte, ok bool) {
 	contents, rest, ok := parseString(in)
@@ -400,6 +403,7 @@ func parseNameList(in []byte) (out []string, rest []byte, ok bool) {
 		return
 	}
 	if len(contents) == 0 {
+		out = emptyNameList
 		return
 	}
 	parts := bytes.Split(contents, comma)