<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[287546] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/287546">287546</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2022-01-03 09:46:10 -0800 (Mon, 03 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Fix Intl.PluralRules.selectRange input validation
https://bugs.webkit.org/show_bug.cgi?id=234817

Reviewed by Alexey Shvayka.

JSTests:

* stress/intl-pluralrules-select-range-validate-inputs.js: Added.
(shouldThrow):
(Intl.PluralRules.prototype.selectRange.shouldThrow):

Source/JavaScriptCore:

Add specified argument validation[1] to Intl.PluralRules.selectRange.

[1]: https://tc39.es/proposal-intl-numberformat-v3/out/pluralrules/proposed.html#sec-intl.pluralrules.prototype.selectrange

* runtime/IntlPluralRules.cpp:
(JSC::IntlPluralRules::selectRange const):
* runtime/IntlPluralRulesPrototype.cpp:
(JSC::JSC_DEFINE_HOST_FUNCTION):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlPluralRulescpp">trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlPluralRulesPrototypecpp">trunk/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressintlpluralrulesselectrangevalidateinputsjs">trunk/JSTests/stress/intl-pluralrules-select-range-validate-inputs.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (287545 => 287546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2022-01-03 17:00:53 UTC (rev 287545)
+++ trunk/JSTests/ChangeLog     2022-01-03 17:46:10 UTC (rev 287546)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><ins>+        [JSC] Fix Intl.PluralRules.selectRange input validation
+        https://bugs.webkit.org/show_bug.cgi?id=234817
+
+        Reviewed by Alexey Shvayka.
+
+        * stress/intl-pluralrules-select-range-validate-inputs.js: Added.
+        (shouldThrow):
+        (Intl.PluralRules.prototype.selectRange.shouldThrow):
+
+2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
+
</ins><span class="cx">         [JSC] Update UCD to Unicode 14.0.0
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234811
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJSTestsstressintlpluralrulesselectrangevalidateinputsjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/intl-pluralrules-select-range-validate-inputs.js (0 => 287546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/intl-pluralrules-select-range-validate-inputs.js                            (rev 0)
+++ trunk/JSTests/stress/intl-pluralrules-select-range-validate-inputs.js       2022-01-03 17:46:10 UTC (rev 287546)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+function shouldThrow(func, errorMessage) {
+    var errorThrown = false;
+    var error = null;
+    try {
+        func();
+    } catch (e) {
+        errorThrown = true;
+        error = e;
+    }
+    if (!errorThrown)
+        throw new Error('not thrown');
+    if (String(error) !== errorMessage)
+        throw new Error(`bad error: ${String(error)}`);
+}
+
+if (Intl.PluralRules.prototype.selectRange) {
+    let pl = new Intl.PluralRules('en-US');
+    shouldThrow(() => {
+        pl.selectRange();
+    }, `TypeError: start or end is undefined`);
+    shouldThrow(() => {
+        pl.selectRange(0, undefined);
+    }, `TypeError: start or end is undefined`);
+    shouldThrow(() => {
+        pl.selectRange(undefined, 0);
+    }, `TypeError: start or end is undefined`);
+    shouldThrow(() => {
+        pl.selectRange(undefined, undefined);
+    }, `TypeError: start or end is undefined`);
+    shouldThrow(() => {
+        pl.selectRange(NaN, 0);
+    }, `RangeError: Passed numbers are out of range`);
+    shouldThrow(() => {
+        pl.selectRange(0, NaN);
+    }, `RangeError: Passed numbers are out of range`);
+    shouldThrow(() => {
+        pl.selectRange(NaN, NaN);
+    }, `RangeError: Passed numbers are out of range`);
+    shouldThrow(() => {
+        pl.selectRange(0, -0);
+    }, `RangeError: start is larger than end`);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (287545 => 287546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2022-01-03 17:00:53 UTC (rev 287545)
+++ trunk/Source/JavaScriptCore/ChangeLog       2022-01-03 17:46:10 UTC (rev 287546)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><ins>+        [JSC] Fix Intl.PluralRules.selectRange input validation
+        https://bugs.webkit.org/show_bug.cgi?id=234817
+
+        Reviewed by Alexey Shvayka.
+
+        Add specified argument validation[1] to Intl.PluralRules.selectRange.
+
+        [1]: https://tc39.es/proposal-intl-numberformat-v3/out/pluralrules/proposed.html#sec-intl.pluralrules.prototype.selectrange
+
+        * runtime/IntlPluralRules.cpp:
+        (JSC::IntlPluralRules::selectRange const):
+        * runtime/IntlPluralRulesPrototype.cpp:
+        (JSC::JSC_DEFINE_HOST_FUNCTION):
+
+2022-01-03  Yusuke Suzuki  <ysuzuki@apple.com>
+
</ins><span class="cx">         [JSC] Update UCD to Unicode 14.0.0
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=234811
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlPluralRulescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp (287545 => 287546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp  2022-01-03 17:00:53 UTC (rev 287545)
+++ trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp     2022-01-03 17:46:10 UTC (rev 287546)
</span><span class="lines">@@ -279,11 +279,15 @@
</span><span class="cx">     VM& vm = globalObject->vm();
</span><span class="cx">     auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> 
</span><del>-    if (start > end) {
-        throwRangeError(globalObject, scope, "start is larger than end"_s);
-        return { };
-    }
</del><ins>+    if (std::isnan(start) || std::isnan(end))
+        return throwRangeError(globalObject, scope, "Passed numbers are out of range"_s);
</ins><span class="cx"> 
</span><ins>+    if (end < start)
+        return throwRangeError(globalObject, scope, "start is larger than end"_s);
+
+    if (isNegativeZero(end) && start >= 0)
+        return throwRangeError(globalObject, scope, "start is larger than end"_s);
+
</ins><span class="cx">     UErrorCode status = U_ZERO_ERROR;
</span><span class="cx">     auto range = std::unique_ptr<UFormattedNumberRange, ICUDeleter<unumrf_closeResult>>(unumrf_openResult(&status));
</span><span class="cx">     if (U_FAILURE(status))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlPluralRulesPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp (287545 => 287546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp 2022-01-03 17:00:53 UTC (rev 287545)
+++ trunk/Source/JavaScriptCore/runtime/IntlPluralRulesPrototype.cpp    2022-01-03 17:46:10 UTC (rev 287546)
</span><span class="lines">@@ -110,10 +110,16 @@
</span><span class="cx">     if (!pluralRules)
</span><span class="cx">         return JSValue::encode(throwTypeError(globalObject, scope, "Intl.PluralRules.prototype.selectRange called on value that's not a PluralRules"_s));
</span><span class="cx"> 
</span><del>-    double start = callFrame->argument(0).toNumber(globalObject);
</del><ins>+    JSValue startValue = callFrame->argument(0);
+    JSValue endValue = callFrame->argument(1);
+
+    if (startValue.isUndefined() || endValue.isUndefined())
+        return throwVMTypeError(globalObject, scope, "start or end is undefined"_s);
+
+    double start = startValue.toNumber(globalObject);
</ins><span class="cx">     RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx"> 
</span><del>-    double end = callFrame->argument(1).toNumber(globalObject);
</del><ins>+    double end = endValue.toNumber(globalObject);
</ins><span class="cx">     RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx"> 
</span><span class="cx">     RELEASE_AND_RETURN(scope, JSValue::encode(pluralRules->selectRange(globalObject, start, end)));
</span></span></pre>
</div>
</div>

</body>
</html>