Commit4f8794d

committed

[release-branch.go1.2] net/textproto: fix CanonicalMIMEHeaderKey panic

««« CL 21450043 / e081962da65cnet/textproto: fix CanonicalMIMEHeaderKey panicFixes#6712R=golang-dev, adg, rscCC=golang-devhttps://golang.org/cl/21450043»»»R=golang-devCC=golang-devhttps://golang.org/cl/25640044

1 parent065f8fd commit4f8794dCopy full SHA for 4f8794d

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -574,13 +574,10 @@ func canonicalMIMEHeaderKey(a []byte) string {`
`574`	`574`	`// and upper case after each dash.`
`575`	`575`	`// (Host, User-Agent, If-Modified-Since).`
`576`	`576`	`// MIME headers are ASCII only, so no Unicode issues.`
`577`		`-ifa[i]==' ' {`
`578`		`-a[i]='-'`
`579`		`-upper=true`
`580`		`-continue`
`581`		`-}`
`582`	`577`	`c:=a[i]`
`583`		`-ifupper&&'a'<=c&&c<='z' {`
	`578`	`+ifc==' ' {`
	`579`	`+c='-'`
	`580`	`+}elseifupper&&'a'<=c&&c<='z' {`
`584`	`581`	`c-=toLower`
`585`	`582`	`}elseif!upper&&'A'<=c&&c<='Z' {`
`586`	`583`	`c+=toLower`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@ var canonicalHeaderKeyTests = []canonicalHeaderKeyTest{`
`25`	`25`	`{"user-agent","User-Agent"},`
`26`	`26`	`{"USER-AGENT","User-Agent"},`
`27`	`27`	`{"üser-agenT","üser-Agent"},// non-ASCII unchanged`
	`28`	`+`
	`29`	`+// This caused a panic due to mishandling of a space:`
	`30`	`+{"C Ontent-Transfer-Encoding","C-Ontent-Transfer-Encoding"},`
	`31`	`+{"foo bar","Foo-Bar"},`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`funcTestCanonicalMIMEHeaderKey(t*testing.T) {`

Comments

(0)