diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 23:32:57 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 23:32:57 +0000 |
| commit | c5a7248b45656b1ca63f9ce35b60ca337f83d3d1 (patch) | |
| tree | 0f6f50e96e99046d820d9b49ccea1294244b7c2a /chrome_frame | |
| parent | df2c7403503b45467d3d76ddc2f42296fa53ac50 (diff) | |
| download | chromium_src-c5a7248b45656b1ca63f9ce35b60ca337f83d3d1.zip chromium_src-c5a7248b45656b1ca63f9ce35b60ca337f83d3d1.tar.gz chromium_src-c5a7248b45656b1ca63f9ce35b60ca337f83d3d1.tar.bz2 | |
Fixes to the string MatchPattern functions:
1) Make it explicit that it only supports ASCII (since it iterates
character by character).
2) Limit the recursion to 16 levels. We could allow more, but in the
case of a ?, it has exponential complexity, so I figured 16 was a good
stopping point. It seems rare that someone would have more than 16
'?' and '*'s.
BUG=28645
Review URL: http://codereview.chromium.org/460047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 10bf92a..dd7ea8b 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -552,7 +552,7 @@ bool IsOptInUrl(const wchar_t* url) { RegistryValueIterator optin_urls_list(config_key.Handle(), kChromeFrameOptinUrlsKey); while (optin_urls_list.Valid()) { - if (MatchPattern(url, optin_urls_list.Name())) + if (MatchPatternWide(url, optin_urls_list.Name())) return true; ++optin_urls_list; } |