qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 21:50:08 -07:00
Code Releases Activity

mime: fix parsing of empty string attribute value

Browse Source 
Fixes #11290.

Change-Id: I312f0731077b78a4bed47062eb7fd1ab52bc3dd1
Reviewed-on: https://go-review.googlesource.com/17453
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Russ Cox 2015-12-04 22:50:23 -05:00 committed by Brad Fitzpatrick
parent 35e84546d7
commit 025e9b0ca3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mime/mediatype.go
View File

@ -289,10 +289,11 @@ func consumeMediaParam(v string) (param, value, rest string) {
} }
rest = rest[1:] // consume equals sign rest = rest[1:] // consume equals sign
rest = strings.TrimLeftFunc(rest, unicode.IsSpace) rest = strings.TrimLeftFunc(rest, unicode.IsSpace)
value, rest = consumeValue(rest) value, rest2 := consumeValue(rest)
if value == "" { if value == "" && rest2 == rest {
return "", "", v return "", "", v
} }
rest = rest2
return param, value, rest return param, value, rest
} }

4
src/mime/mediatype_test.go
View File

@ -217,6 +217,9 @@ func TestParseMediaType(t *testing.T) {
{`form-data; firstname="Брэд"; lastname="Фицпатрик"`, {`form-data; firstname="Брэд"; lastname="Фицпатрик"`,
"form-data", "form-data",
m("firstname", "Брэд", "lastname", "Фицпатрик")}, m("firstname", "Брэд", "lastname", "Фицпатрик")},
// Empty string used to be mishandled.
{`foo; bar=""`, "foo", m("bar", "")},
} }
for _, test := range tests { for _, test := range tests {
mt, params, err := ParseMediaType(test.in) mt, params, err := ParseMediaType(test.in)
@ -295,6 +298,7 @@ var formatTests = []formatTest{
{"foo/BAR", map[string]string{"nonascii": "not an ascii character: ä"}, ""}, {"foo/BAR", map[string]string{"nonascii": "not an ascii character: ä"}, ""},
{"foo/bar", map[string]string{"a": "av", "b": "bv", "c": "cv"}, "foo/bar; a=av; b=bv; c=cv"}, {"foo/bar", map[string]string{"a": "av", "b": "bv", "c": "cv"}, "foo/bar; a=av; b=bv; c=cv"},
{"foo/bar", map[string]string{"0": "'", "9": "'"}, "foo/bar; 0='; 9='"}, {"foo/bar", map[string]string{"0": "'", "9": "'"}, "foo/bar; 0='; 9='"},
{"foo", map[string]string{"bar": ""}, `foo; bar=""`},
} }
func TestFormatMediaType(t *testing.T) { func TestFormatMediaType(t *testing.T) {