[Regression fix] [Data URI parser] Accept data URI with invalid mediatype data

net/url_request/url_request_data_job.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Simple implementation of a data: protocol handler.
 
 #include "net/url_request/url_request_data_job.h"
 
 #include "net/base/data_url.h"
+#include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "url/gurl.h"
 
 namespace net {
 
 int URLRequestDataJob::BuildResponse(const GURL& url,
                                      std::string* mime_type,
                                      std::string* charset,
                                      std::string* data,
                                      HttpResponseHeaders* headers) {
   if (!net::DataURL::Parse(url, mime_type, charset, data))
     return net::ERR_INVALID_URL;
 
   // |mime_type| set by net::DataURL::Parse() is guaranteed to be in
   //     token "/" token
   // form. |charset| is also guaranteed to be a token.
 
   DCHECK(!mime_type->empty());
   DCHECK(!charset->empty());
 
   if (headers) {
     headers->ReplaceStatusLine("HTTP/1.1 200 OK");
     // "charset" in the Content-Type header is specified explicitly to follow
     // the "token" ABNF in the HTTP spec. When DataURL::Parse() call is
     // successful, it's guaranteed that the string in |charset| follows the
     // "token" ABNF.
-    std::string content_type_header =
-        "Content-Type: " + *mime_type + ";charset=" + *charset;
-    headers->AddHeader(content_type_header);
+    if (ParseMimeTypeWithoutParameter(*mime_type, NULL, NULL)) {
+      std::string content_type_header =
+          "Content-Type: " + *mime_type + ";charset=" + *charset;
+      headers->AddHeader(content_type_header);
+    }
     headers->AddHeader("Access-Control-Allow-Origin: *");
   }
 
   return net::OK;
 }
 
 URLRequestDataJob::URLRequestDataJob(
     URLRequest* request, NetworkDelegate* network_delegate)
     : URLRequestSimpleJob(request, network_delegate) {
 }
@@ skipping 10 matching lines @@
 
   // TODO(tyoshino): Get the headers and export via
   // URLRequestJob::GetResponseInfo().
   return BuildResponse(url, mime_type, charset, data, NULL);
 }
 
 URLRequestDataJob::~URLRequestDataJob() {
 }
 
 }  // namespace net