Changeset 249020 in webkit

Timestamp:

Aug 22, 2019 11:18:04 AM (5 years ago)

Author:

Justin Michaud

Message:

Add missing exception check in canonicalizeLocaleList
​https://bugs.webkit.org/show_bug.cgi?id=201021

Reviewed by Mark Lam.

JSTests:

• stress/missing-exception-check-in-canonicalizeLocaleList.js: Added.

(catch):

Source/JavaScriptCore:

• runtime/IntlObject.cpp:

(JSC::canonicalizeLocaleList):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/missing-exception-check-in-canonicalizeLocaleList.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlObject.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2019-08-22  Justin Michaud  <justin_michaud@apple.com>
+
+        Add missing exception check in canonicalizeLocaleList
+        https://bugs.webkit.org/show_bug.cgi?id=201021
+
+        Reviewed by Mark Lam.
+
+        * stress/missing-exception-check-in-canonicalizeLocaleList.js: Added.
+        (catch):
+
 2019-08-21  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-22  Justin Michaud  <justin_michaud@apple.com>
+
+        Add missing exception check in canonicalizeLocaleList
+        https://bugs.webkit.org/show_bug.cgi?id=201021
+
+        Reviewed by Mark Lam.
+
+        * runtime/IntlObject.cpp:
+        (JSC::canonicalizeLocaleList):
+
 2019-08-17  Darin Adler  <darin@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlObject.cpp

@@ -550 +550 @@
             RETURN_IF_EXCEPTION(scope, Vector<String>());
 
-            String canonicalizedTag = canonicalizeLanguageTag(tag->value(&state));
+            auto tagValue = tag->value(&state);
+            RETURN_IF_EXCEPTION(scope, Vector<String>());
+
+            String canonicalizedTag = canonicalizeLanguageTag(tagValue);
             if (canonicalizedTag.isNull()) {
-                throwException(&state, scope, createRangeError(&state, "invalid language tag: " + tag->value(&state)));
+                throwException(&state, scope, createRangeError(&state, "invalid language tag: " + tagValue));
                 return Vector<String>();
             }