mime: keep parsing after trailing semicolon

Fixes #46323

Change-Id: Ibd624b1aaa15f907b7eb965b4eaec61018a45486
GitHub-Last-Rev: 7ad670b088144a2a09860dd990c53dea75c0d40f
GitHub-Pull-Request: golang/go#47029
Reviewed-on: https://go-review.googlesource.com/c/go/+/332509
Trust: Ian Lance Taylor <iant@golang.org>
Trust: Damien Neil <dneil@google.com>
Reviewed-by: Damien Neil <dneil@google.com>

diff --git a/src/mime/mediatype.go b/src/mime/mediatype.go
index 9456570cf1f35b4807cc1aafe68187ee1a8db1a5..6c1b095065a8bd59e2d1ea6d9b2af0b3aa9c1f94 100644 (file)
--- a/src/mime/mediatype.go
+++ b/src/mime/mediatype.go
@@ -163,7 +163,7 @@ func ParseMediaType(v string) (mediatype string, params map[string]string, err e
                        if strings.TrimSpace(rest) == ";" {
                                // Ignore trailing semicolons.
                                // Not an error.
-                               return
+                               break
                        }
                        // Parse error.
                        return mediatype, nil, ErrInvalidMediaParameter

diff --git a/src/mime/mediatype_test.go b/src/mime/mediatype_test.go
index e91ff38d68b4892d8ff1b8f1836db51ac0920c6e..079c080db716f19caee14186cc02baf2cf5bfc44 100644 (file)
--- a/src/mime/mediatype_test.go
+++ b/src/mime/mediatype_test.go
@@ -42,7 +42,7 @@ func TestConsumeValue(t *testing.T) {
                {`"My \" value"end`, "My \" value", "end"},
                {`"\" rest`, "", `"\" rest`},
                {`"C:\dev\go\robots.txt"`, `C:\dev\go\robots.txt`, ""},
-               {`"C:\新建文件件\中文第二次测试.mp4"`, `C:\新建文件件\中文第二次测试.mp4`, ""},
+               {`"C:\新建文件夹\中文第二次测试.mp4"`, `C:\新建文件夹\中文第二次测试.mp4`, ""},
        }
        for _, test := range tests {
                value, rest := consumeValue(test[0])
@@ -394,10 +394,21 @@ func TestParseMediaType(t *testing.T) {
                // Empty string used to be mishandled.
                {`foo; bar=""`, "foo", m("bar", "")},
 
-               // Microsoft browers in intranet mode do not think they need to escape \ in file name.
+               // Microsoft browsers in intranet mode do not think they need to escape \ in file name.
                {`form-data; name="file"; filename="C:\dev\go\robots.txt"`, "form-data", m("name", "file", "filename", `C:\dev\go\robots.txt`)},
-               {`form-data; name="file"; filename="C:\新建文件件\中文第二次测试.mp4"`, "form-data", m("name", "file", "filename", `C:\新建文件件\中文第二次测试.mp4`)},
+               {`form-data; name="file"; filename="C:\新建文件夹\中文第二次测试.mp4"`, "form-data", m("name", "file", "filename", `C:\新建文件夹\中文第二次测试.mp4`)},
+
+               // issue #46323 (https://github.com/golang/go/issues/46323)
+               {
+                       // example from rfc2231-p.3 (https://datatracker.ietf.org/doc/html/rfc2231)
+                       `message/external-body; access-type=URL;
+               URL*0="ftp://";
+               URL*1="cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar";`, // <-- trailing semicolon
+                       `message/external-body`,
+                       m("access-type", "URL", "url", "ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"),
+               },
        }
+
        for _, test := range tests {
                mt, params, err := ParseMediaType(test.in)
                if err != nil {