summaryrefslogtreecommitdiffstats
path: root/net/base/data_url.cc
diff options
context:
space:
mode:
authornsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-29 20:57:35 +0000
committernsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-29 20:57:35 +0000
commit6be5dd40860ccdb891d18b701716e756ba56e917 (patch)
treea190daf03246d0014fb8d8843bcbefb3b3215c27 /net/base/data_url.cc
parent27aca5ae73f4d85c84fa8fdbc54e9e4e0d6c82a0 (diff)
downloadchromium_src-6be5dd40860ccdb891d18b701716e756ba56e917.zip
chromium_src-6be5dd40860ccdb891d18b701716e756ba56e917.tar.gz
chromium_src-6be5dd40860ccdb891d18b701716e756ba56e917.tar.bz2
Reverting revision 70, 66 and 65 to fix crashes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/data_url.cc')
-rw-r--r--net/base/data_url.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/base/data_url.cc b/net/base/data_url.cc
index 95d31e7..cf8e239 100644
--- a/net/base/data_url.cc
+++ b/net/base/data_url.cc
@@ -97,8 +97,7 @@ 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::URL_SPECIAL_CHARS |
- UnescapeRule::CONTROL_CHARS);
+ UnescapeRule::SPACES | UnescapeRule::PERCENTS);
}
// Strip whitespace.
@@ -111,8 +110,7 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type,
if (!base64_encoded) {
temp_data = UnescapeURLComponent(temp_data,
- UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS |
- UnescapeRule::CONTROL_CHARS);
+ UnescapeRule::SPACES | UnescapeRule::PERCENTS);
}
if (base64_encoded)