Changeset 274784 in webkit

Timestamp:

Mar 22, 2021 1:07:23 PM (16 months ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Intl.Locale should not assume is8Bit
​https://bugs.webkit.org/show_bug.cgi?id=223553

Reviewed by Ross Kirsling.

JSTests:

• stress/intl-locale-non-8bit.js: Added.

(shouldBe):

Source/JavaScriptCore:

is8Bit or not is not guaranteed if it is an user-input. For example, "test日本語".substring(0, 3) should be non 8Bit string.
Intl.Locale has several places that assumed that input should be 8Bit if they are ASCII. This patch fixes it.

• runtime/IntlLocale.cpp:

(JSC::LocaleIDBuilder::overrideLanguageScriptRegion):
(JSC::LocaleIDBuilder::setKeywordValue):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/intl-locale-non-8bit.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlLocale.cpp (modified) (3 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-03-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Intl.Locale should not assume is8Bit
+        https://bugs.webkit.org/show_bug.cgi?id=223553
+
+        Reviewed by Ross Kirsling.
+
+        * stress/intl-locale-non-8bit.js: Added.
+        (shouldBe):
+
 2021-03-19  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Intl.Locale should not assume is8Bit
+        https://bugs.webkit.org/show_bug.cgi?id=223553
+
+        Reviewed by Ross Kirsling.
+
+        is8Bit or not is not guaranteed if it is an user-input. For example, "test日本語".substring(0, 3) should be non 8Bit string.
+        Intl.Locale has several places that assumed that input should be 8Bit if they are ASCII. This patch fixes it.
+
+        * runtime/IntlLocale.cpp:
+        (JSC::LocaleIDBuilder::overrideLanguageScriptRegion):
+        (JSC::LocaleIDBuilder::setKeywordValue):
+
 2021-03-22  Sam Weinig  <weinig@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlLocale.cpp

@@ -151 +151 @@
             hasAppended = true;
 
-        ASSERT(subtag.is8Bit() && subtag.isAllASCII());
-        buffer.append(reinterpret_cast<const char*>(subtag.characters8()), subtag.length());
+        ASSERT(subtag.isAllASCII());
+        if (subtag.is8Bit())
+            buffer.append(subtag.characters8(), subtag.length());
+        else
+            buffer.append(subtag.characters16(), subtag.length());
     }
 
@@ -158 +161 @@
         auto rest = localeIDView.right(length - endOfLanguageScriptRegionVariant);
 
-        ASSERT(rest.is8Bit() && rest.isAllASCII());
-        buffer.append(reinterpret_cast<const char*>(rest.characters8()), rest.length());
+        ASSERT(rest.isAllASCII());
+        if (rest.is8Bit())
+            buffer.append(rest.characters8(), rest.length());
+        else
+            buffer.append(rest.characters16(), rest.length());
     }
 
@@ -170 +176 @@
     ASSERT(m_buffer.size());
 
-    ASSERT(value.is8Bit() && value.isAllASCII());
-    CString rawValue { reinterpret_cast<const char*>(value.characters8()), value.length() };
+    ASSERT(value.isAllASCII());
+    Vector<char, 32> rawValue(value.length() + 1);
+    if (value.is8Bit())
+        StringImpl::copyCharacters(reinterpret_cast<LChar*>(rawValue.data()), value.characters8(), value.length());
+    else
+        StringImpl::copyCharacters(reinterpret_cast<LChar*>(rawValue.data()), value.characters16(), value.length());
+    rawValue[value.length()] = '\0';
 
     UErrorCode status = U_ZERO_ERROR;