Attachment 345847 Details for Bug 167991 – Patch

[patch] Patch

bug-167991-20180726093246.patch (text/plain), 13.66 KB, created by Andy VanWagoner on 2018-07-26 08:32:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy VanWagoner

Created: 2018-07-26 08:32:47 PDT

Size: 13.66 KB

patch

obsolete

>Subversion Revision: 234218
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 5ea0082297f8986aa07438cd69c3da66a3f0527e..3cbadcf6dbc6fc198c429e1b09f15197577ab6f9 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-07-25  Andy VanWagoner  <andy@vanwagoner.family>
>+
>+        JSC: Intl API should ignore encoding when parsing BCP 47 language tag from ISO 15897 locale string (passed via LANG)
>+        https://bugs.webkit.org/show_bug.cgi?id=167991
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        Improved the conversion of ICU locales to BCP47 tags, using their preferred method.
>+        Checked locale.isEmpty() before returning it from defaultLocale, so there should be
>+        no more cases where you might have an invalid locale come back from resolveLocale.
>+
>+        * runtime/IntlObject.cpp:
>+        (JSC::convertICULocaleToBCP47LanguageTag):
>+        (JSC::defaultLocale):
>+        (JSC::lookupMatcher):
>+        * runtime/IntlObject.h:
>+        * runtime/JSGlobalObject.cpp:
>+        (JSC::JSGlobalObject::intlCollatorAvailableLocales):
>+        (JSC::JSGlobalObject::intlDateTimeFormatAvailableLocales):
>+        (JSC::JSGlobalObject::intlNumberFormatAvailableLocales):
>+        (JSC::JSGlobalObject::intlPluralRulesAvailableLocales):
>+
> 2018-07-25  Andy VanWagoner  <andy@vanwagoner.family>
> 
>         [INTL] Call Typed Array elements toLocaleString with locale and options
>diff --git a/Source/JavaScriptCore/runtime/IntlObject.cpp b/Source/JavaScriptCore/runtime/IntlObject.cpp
>index 170f8dd68f37ee8230f8e9a6bf704c6f88bb19b5..b2027e479667072c64411d4a7b77da7dbde6a740 100644
>--- a/Source/JavaScriptCore/runtime/IntlObject.cpp
>+++ b/Source/JavaScriptCore/runtime/IntlObject.cpp
>@@ -130,9 +130,19 @@ Structure* IntlObject::createStructure(VM& vm, JSGlobalObject* globalObject, JSV
>     return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
> }
> 
>-void convertICULocaleToBCP47LanguageTag(String& locale)
>+String convertICULocaleToBCP47LanguageTag(const char* localeID)
> {
>-    locale.replace('_', '-');
>+    UErrorCode status = U_ZERO_ERROR;
>+    Vector<char, 32> buffer(32);
>+    auto length = uloc_toLanguageTag(localeID, buffer.data(), buffer.size(), false, &status);
>+    if (status == U_BUFFER_OVERFLOW_ERROR) {
>+        buffer.grow(length);
>+        status = U_ZERO_ERROR;
>+        uloc_toLanguageTag(localeID, buffer.data(), buffer.size(), false, &status);
>+    }
>+    if (!U_FAILURE(status))
>+        return String(buffer.data(), length);
>+    return String();
> }
> 
> bool intlBooleanOption(ExecState& state, JSValue options, PropertyName property, bool& usesFallback)
>@@ -590,20 +600,25 @@ String defaultLocale(ExecState& state)
>     // same thing as userPreferredLanguages()[0].
>     VM& vm = state.vm();
>     if (auto defaultLanguage = state.jsCallee()->globalObject(vm)->globalObjectMethodTable()->defaultLanguage) {
>-        String locale = defaultLanguage();
>+        String locale = canonicalizeLanguageTag(defaultLanguage());
>         if (!locale.isEmpty())
>-            return canonicalizeLanguageTag(locale);
>+            return locale;
>     }
> 
>     Vector<String> languages = userPreferredLanguages();
>-    if (!languages.isEmpty() && !languages[0].isEmpty())
>-        return canonicalizeLanguageTag(languages[0]);
>+    for (const auto& language : languages) {
>+        String locale = canonicalizeLanguageTag(language);
>+        if (!locale.isEmpty())
>+            return locale;
>+    }
> 
>     // If all else fails, ask ICU. It will probably say something bogus like en_us even if the user
>     // has configured some other language, but being wrong is better than crashing.
>-    String locale = uloc_getDefault();
>-    convertICULocaleToBCP47LanguageTag(locale);
>-    return locale;
>+    String locale = convertICULocaleToBCP47LanguageTag(uloc_getDefault());
>+    if (!locale.isEmpty())
>+        return locale;
>+
>+    return "en"_s;
> }
> 
> String removeUnicodeLocaleExtension(const String& locale)
>@@ -646,7 +661,7 @@ static MatcherResult lookupMatcher(ExecState& state, const HashSet<String>& avai
>     }
> 
>     MatcherResult result;
>-    if (!availableLocale.isNull()) {
>+    if (!availableLocale.isEmpty()) {
>         result.locale = availableLocale;
>         if (locale != noExtensionsLocale) {
>             size_t extensionIndex = locale.find("-u-");
>diff --git a/Source/JavaScriptCore/runtime/IntlObject.h b/Source/JavaScriptCore/runtime/IntlObject.h
>index 7e5386465d61841cc2e8f8d2487614e55bc38f95..b9d870e2013a510e15ce18b51a1cbd5325439007 100644
>--- a/Source/JavaScriptCore/runtime/IntlObject.h
>+++ b/Source/JavaScriptCore/runtime/IntlObject.h
>@@ -59,7 +59,7 @@ private:
> };
> 
> String defaultLocale(ExecState&);
>-void convertICULocaleToBCP47LanguageTag(String& locale);
>+String convertICULocaleToBCP47LanguageTag(const char* localeID);
> bool intlBooleanOption(ExecState&, JSValue options, PropertyName, bool& usesFallback);
> String intlStringOption(ExecState&, JSValue options, PropertyName, std::initializer_list<const char*> values, const char* notFound, const char* fallback);
> unsigned intlNumberOption(ExecState&, JSValue options, PropertyName, unsigned minimum, unsigned maximum, unsigned fallback);
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>index aee3d2ce286783f25b19cc4b20602702e56c63c9..047cedf4f119fc4b8eeb6b8d5dacb36bf81f18ce 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>@@ -1582,9 +1582,9 @@ const HashSet<String>& JSGlobalObject::intlCollatorAvailableLocales()
>     if (m_intlCollatorAvailableLocales.isEmpty()) {
>         int32_t count = ucol_countAvailable();
>         for (int32_t i = 0; i < count; ++i) {
>-            String locale(ucol_getAvailable(i));
>-            convertICULocaleToBCP47LanguageTag(locale);
>-            m_intlCollatorAvailableLocales.add(locale);
>+            String locale = convertICULocaleToBCP47LanguageTag(ucol_getAvailable(i));
>+            if (!locale.isEmpty())
>+                m_intlCollatorAvailableLocales.add(locale);
>         }
>         addMissingScriptLocales(m_intlCollatorAvailableLocales);
>     }
>@@ -1596,9 +1596,9 @@ const HashSet<String>& JSGlobalObject::intlDateTimeFormatAvailableLocales()
>     if (m_intlDateTimeFormatAvailableLocales.isEmpty()) {
>         int32_t count = udat_countAvailable();
>         for (int32_t i = 0; i < count; ++i) {
>-            String locale(udat_getAvailable(i));
>-            convertICULocaleToBCP47LanguageTag(locale);
>-            m_intlDateTimeFormatAvailableLocales.add(locale);
>+            String locale = convertICULocaleToBCP47LanguageTag(udat_getAvailable(i));
>+            if (!locale.isEmpty())
>+                m_intlDateTimeFormatAvailableLocales.add(locale);
>         }
>         addMissingScriptLocales(m_intlDateTimeFormatAvailableLocales);
>     }
>@@ -1610,9 +1610,9 @@ const HashSet<String>& JSGlobalObject::intlNumberFormatAvailableLocales()
>     if (m_intlNumberFormatAvailableLocales.isEmpty()) {
>         int32_t count = unum_countAvailable();
>         for (int32_t i = 0; i < count; ++i) {
>-            String locale(unum_getAvailable(i));
>-            convertICULocaleToBCP47LanguageTag(locale);
>-            m_intlNumberFormatAvailableLocales.add(locale);
>+            String locale = convertICULocaleToBCP47LanguageTag(unum_getAvailable(i));
>+            if (!locale.isEmpty())
>+                m_intlNumberFormatAvailableLocales.add(locale);
>         }
>         addMissingScriptLocales(m_intlNumberFormatAvailableLocales);
>     }
>@@ -1624,9 +1624,9 @@ const HashSet<String>& JSGlobalObject::intlPluralRulesAvailableLocales()
>     if (m_intlPluralRulesAvailableLocales.isEmpty()) {
>         int32_t count = uloc_countAvailable();
>         for (int32_t i = 0; i < count; ++i) {
>-            String locale(uloc_getAvailable(i));
>-            convertICULocaleToBCP47LanguageTag(locale);
>-            m_intlPluralRulesAvailableLocales.add(locale);
>+            String locale = convertICULocaleToBCP47LanguageTag(uloc_getAvailable(i));
>+            if (!locale.isEmpty())
>+                m_intlPluralRulesAvailableLocales.add(locale);
>         }
>         addMissingScriptLocales(m_intlPluralRulesAvailableLocales);
>     }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3f4320dd41f7b9c7329728a5e056b54076dafac8..14e4192904e839260ff14784dbf55ef3f5bc3ed8 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-07-25  Andy VanWagoner  <andy@vanwagoner.family>
>+
>+        JSC: Intl API should ignore encoding when parsing BCP 47 language tag from ISO 15897 locale string (passed via LANG)
>+        https://bugs.webkit.org/show_bug.cgi?id=167991
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        Replaced expecting throwing a runtime error to avoid a crash, with testing for good default locale fallback behavior.
>+
>+        * js/intl-default-locale-expected.txt: Added.
>+        * js/intl-default-locale.html: Added.
>+        * js/intl-invalid-locale-crash-expected.txt: Removed.
>+        * js/intl-invalid-locale-crash.html: Removed.
>+        * platform/win/TestExpectations:
>+
> 2018-07-25  Zalan Bujtas  <zalan@apple.com>
> 
>         REGRESSION(r227577) Text on TV & Movies page doesn't wrap properly in iTunes
>diff --git a/LayoutTests/js/intl-default-locale-expected.txt b/LayoutTests/js/intl-default-locale-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..233f26ee88224bc6b4983dbfcec3b2ef53ed528e
>--- /dev/null
>+++ b/LayoutTests/js/intl-default-locale-expected.txt
>@@ -0,0 +1,7 @@
>+PASS new Intl.DateTimeFormat().resolvedOptions().locale is 'tlh'
>+PASS new Intl.NumberFormat().resolvedOptions().locale is 'tlh'
>+PASS new Intl.Collator().resolvedOptions().locale is 'tlh'
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/intl-default-locale.html b/LayoutTests/js/intl-default-locale.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b105958c497137408b213a8e34e65df1ac0ed32a
>--- /dev/null
>+++ b/LayoutTests/js/intl-default-locale.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<meta charset="utf-8">
>+<script src="../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+if (window.internals) {
>+    // Any language name with less than two characters is considered invalid, so we use "a" here.
>+    // "i-klingon" is grandfathered, and is canonicalized "tlh".
>+    // It should not be part of any available locale sets, so we know it came from here.
>+    window.internals.setUserPreferredLanguages([ "a", "*", "en_US.utf8", "i-klingon", "en-US" ]);
>+}
>+shouldBe("new Intl.DateTimeFormat().resolvedOptions().locale", "'tlh'");
>+shouldBe("new Intl.NumberFormat().resolvedOptions().locale", "'tlh'");
>+shouldBe("new Intl.Collator().resolvedOptions().locale", "'tlh'");
>+</script>
>+<script src="../resources/js-test-post.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/intl-invalid-locale-crash-expected.txt b/LayoutTests/js/intl-invalid-locale-crash-expected.txt
>deleted file mode 100644
>index 2011d6651981bc3b5e7ec184c224931143130516..0000000000000000000000000000000000000000
>--- a/LayoutTests/js/intl-invalid-locale-crash-expected.txt
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-PASS new Intl.DateTimeFormat().resolvedOptions() threw exception TypeError: failed to initialize DateTimeFormat due to invalid locale.
>-PASS new Intl.NumberFormat().resolvedOptions() threw exception TypeError: failed to initialize NumberFormat due to invalid locale.
>-PASS new Intl.Collator().resolvedOptions() threw exception TypeError: failed to initialize Collator due to invalid locale.
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
>-
>diff --git a/LayoutTests/js/intl-invalid-locale-crash.html b/LayoutTests/js/intl-invalid-locale-crash.html
>deleted file mode 100644
>index a113d372a6b5285884951e9f21eb44092685dac6..0000000000000000000000000000000000000000
>--- a/LayoutTests/js/intl-invalid-locale-crash.html
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>-<html>
>-<head>
>-<meta charset="utf-8">
>-<script src="../resources/js-test-pre.js"></script>
>-</head>
>-<body>
>-<script>
>-if (window.internals) {
>-    // Any language name with less than two characters is considered invalid, so we use "a" here.
>-    window.internals.setUserPreferredLanguages(["a"]);
>-}
>-shouldThrow("new Intl.DateTimeFormat().resolvedOptions()", "'TypeError: failed to initialize DateTimeFormat due to invalid locale'");
>-shouldThrow("new Intl.NumberFormat().resolvedOptions()", "'TypeError: failed to initialize NumberFormat due to invalid locale'");
>-shouldThrow("new Intl.Collator().resolvedOptions()", "'TypeError: failed to initialize Collator due to invalid locale'");
>-</script>
>-<script src="../resources/js-test-post.js"></script>
>-</body>
>-</html>
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index 5bd3528cb256bd721695bb3c63ab7e7766d7c41f..0ed66052b06b22523a26e57968d6e88243135bbf 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -2481,6 +2481,7 @@ js/array-toLocaleString.html [ Skip ]
> js/date-toLocaleString.html [ Skip ]
> js/intl-collator.html [ Skip ]
> js/intl-datetimeformat.html [ Skip ]
>+js/intl-default-locale.html [ Skip ]
> js/intl-numberformat.html [ Skip ]
> js/intl-numberformat-format-to-parts.html [ Skip ]
> js/intl-pluralrules.html [ Skip ]
>@@ -3347,7 +3348,6 @@ js/dom/deep-recursion-test.html [ Failure ]
> js/dom/regress-157246.html [ Failure ]
> js/dom/string-prototype-properties.html [ Failure ]
> js/dom/webidl-type-mapping.html [ Failure ]
>-js/intl-invalid-locale-crash.html [ Failure ]
> js/regress-141098.html [ Failure ]
> pageoverlay/overlay-installation.html [ Failure ]
> pageoverlay/overlay-large-document-scrolled.html [ Failure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 167991: 345787 | 345813 | 345840 | 345847