summaryrefslogtreecommitdiffstats
path: root/net/base/data_url.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 23:50:22 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 23:50:22 +0000
commitf20dac42c398c437ff65c79c9a5610bd8e04af91 (patch)
tree307ab7f13f413255bda0f0a8d41cbf0ea5a830c2 /net/base/data_url.cc
parent96354fc5a07b8a41b02989946fbfbcab491a97b6 (diff)
downloadchromium_src-f20dac42c398c437ff65c79c9a5610bd8e04af91.zip
chromium_src-f20dac42c398c437ff65c79c9a5610bd8e04af91.tar.gz
chromium_src-f20dac42c398c437ff65c79c9a5610bd8e04af91.tar.bz2
I looked at the full dump from the previous crashes and it looks like a testing issue. Hopefully it will be magically unbroken.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/data_url.cc')
-rw-r--r--net/base/data_url.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/base/data_url.cc b/net/base/data_url.cc
index 4040a66..31edbd0 100644
--- a/net/base/data_url.cc
+++ b/net/base/data_url.cc
@@ -99,7 +99,8 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type,
// could be part of the payload, so don't strip it.
if (base64_encoded) {
temp_data = UnescapeURLComponent(temp_data,
- UnescapeRule::SPACES | UnescapeRule::PERCENTS);
+ UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS |
+ UnescapeRule::CONTROL_CHARS);
}
// Strip whitespace.
@@ -112,7 +113,8 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type,
if (!base64_encoded) {
temp_data = UnescapeURLComponent(temp_data,
- UnescapeRule::SPACES | UnescapeRule::PERCENTS);
+ UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS |
+ UnescapeRule::CONTROL_CHARS);
}
if (base64_encoded)