Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: net/base/data_url.cc

Issue 54233002: Make net::DataURL's MIME string check stricter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split web_url_loader_impl change Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/data_url.cc
diff --git a/net/base/data_url.cc b/net/base/data_url.cc
index e7b46cd44ceb5bc144d29ffc99fb4489a1a02eaf..9699136c85fd5cff3f62270b9336e35bd4d51f74 100644
--- a/net/base/data_url.cc
+++ b/net/base/data_url.cc
@@ -13,6 +13,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "net/base/escape.h"
+#include "net/base/mime_util.h"
#include "url/gurl.h"
namespace net {
@@ -59,9 +60,12 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type,
}
}
- // fallback to defaults if nothing specified in the URL:
- if (mime_type->empty())
+ if (mime_type->empty()) {
+ // fallback to defaults if nothing specified in the URL:
mime_type->assign("text/plain");
+ } else if (!ParseMimeTypeWithoutParameter(*mime_type, NULL, NULL)) {
+ return false;
+ }
if (charset->empty())
charset->assign("US-ASCII");
« no previous file with comments | « content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc ('k') | net/base/data_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698