diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-20 10:17:04 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-07-07 09:15:41 +0000 |
| commit | 41c20711637fa1d117ece075dd6833bc9685b6af (patch) | |
| tree | 5822c19d339e6b5ac6644076ca71176b0a26b7cc | |
| parent | e2ac3f691545dc4565e9124a7315b2f47efbd819 (diff) | |
[Backport] Fix for CVE-2017-5089
Remove a small range of Tibetan characters from the allowed IDN set on Mac.
These characters do not display in the default macOS system font, despite the
font reporting that the glyphs are present.
BUG=714196
TBR=rsesek@chromium.org
(cherry picked from commit bccbe7c22a38f68da0c4d0bb9258060f2554e318)
Change-Id: I7bc8eae1be5e928b65d2a74a9e177bd4b77722fd
Review-Url: https://codereview.chromium.org/2865213002
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/components/url_formatter/url_formatter.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/components/url_formatter/url_formatter.cc b/chromium/components/url_formatter/url_formatter.cc index e5822fa8bfb..60c88c5eb88 100644 --- a/chromium/components/url_formatter/url_formatter.cc +++ b/chromium/components/url_formatter/url_formatter.cc @@ -432,6 +432,9 @@ bool IsIDNComponentSafe(const base::char16* str, "[\\u2010\\u2024\\u2027\\u2028\\u2029\\u2039\\u203a\\u2044\\u205f]" "[\\u2154-\\u2156][\\u2159-\\u215b][\\u215f\\u2215\\u23ae" "\\u29f6\\u29f8\\u2afb\\u2afd][\\u2ff0-\\u2ffb][\\u3014" +#if defined(OS_MACOSX) + "\\u0f8cu\\u0f8du\\u0f8eu\\u0f8fu" +#endif "\\u3015\\u3033\\u3164\\u321d\\u321e\\u33ae\\u33af\\u33c6\\u33df\\ufe" "14" "\\ufe15\\ufe3f\\ufe5d\\ufe5e\\ufeff\\uff0e\\uff06\\uff61\\uffa0\\uff" |