summaryrefslogtreecommitdiffstats
path: root/chrome/utility
diff options
context:
space:
mode:
authormmenke <mmenke@chromium.org>2016-03-07 13:37:53 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-07 21:39:40 +0000
commit50e411b47515eddff0c159979ba99a8a70c67897 (patch)
tree7d881f79b378c1aa2cec9ddf19eda58f181da8f4 /chrome/utility
parent6f344af54443c7e169e2b6969174f4d5986e3335 (diff)
downloadchromium_src-50e411b47515eddff0c159979ba99a8a70c67897.zip
chromium_src-50e411b47515eddff0c159979ba99a8a70c67897.tar.gz
chromium_src-50e411b47515eddff0c159979ba99a8a70c67897.tar.bz2
Remove UnescapeRule::URL_SPECIAL_CHARS from chrome/ and extensions/
We're removing this, in favor of PATH_SEPARATORS and URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS, to reduce the risk of security issues when unescaping, going forward. In most cases, this CL just replaces the old flag with both of the new ones, though in bookmark_html_reader.cc, it now uses just URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS. BUG=589257 Review URL: https://codereview.chromium.org/1767453002 Cr-Commit-Position: refs/heads/master@{#379648}
Diffstat (limited to 'chrome/utility')
-rw-r--r--chrome/utility/importer/bookmark_html_reader.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
index 11e0750..a9edfeb 100644
--- a/chrome/utility/importer/bookmark_html_reader.cc
+++ b/chrome/utility/importer/bookmark_html_reader.cc
@@ -267,8 +267,8 @@ bool CanImportURLAsSearchEngine(const GURL& url,
if (url_spec.empty())
return false;
- url_spec = net::UnescapeURLComponent(url_spec,
- net::UnescapeRule::URL_SPECIAL_CHARS);
+ url_spec = net::UnescapeURLComponent(
+ url_spec, net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
// Replace replacement terms ("%s") in |url_spec| with {searchTerms}.
url_spec =