<!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>[248802] 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/248802">248802</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2019-08-16 16:49:27 -0700 (Fri, 16 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>More missing exception checks in string comparison operators.
https://bugs.webkit.org/show_bug.cgi?id=200844
<rdar://problem/54378684>

Reviewed by Saam Barati.

JSTests:

* stress/missing-exception-check-in-string-greater-than-compare.js: Added.
* stress/missing-exception-check-in-string-greater-than-or-equal-compare.js: Added.
* stress/missing-exception-check-in-string-less-than-compare.js: Added.
* stress/missing-exception-check-in-string-less-than-or-equal-compare.js: Added.

Source/JavaScriptCore:

* runtime/Operations.h:
(JSC::jsLess):
(JSC::jsLessEq):</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="#trunkSourceJavaScriptCoreruntimeOperationsh">trunk/Source/JavaScriptCore/runtime/Operations.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressmissingexceptioncheckinstringgreaterthancomparejs">trunk/JSTests/stress/missing-exception-check-in-string-greater-than-compare.js</a></li>
<li><a href="#trunkJSTestsstressmissingexceptioncheckinstringgreaterthanorequalcomparejs">trunk/JSTests/stress/missing-exception-check-in-string-greater-than-or-equal-compare.js</a></li>
<li><a href="#trunkJSTestsstressmissingexceptioncheckinstringlessthancomparejs">trunk/JSTests/stress/missing-exception-check-in-string-less-than-compare.js</a></li>
<li><a href="#trunkJSTestsstressmissingexceptioncheckinstringlessthanorequalcomparejs">trunk/JSTests/stress/missing-exception-check-in-string-less-than-or-equal-compare.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (248801 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2019-08-16 23:02:16 UTC (rev 248801)
+++ trunk/JSTests/ChangeLog     2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2019-08-16  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><ins>+        More missing exception checks in string comparison operators.
+        https://bugs.webkit.org/show_bug.cgi?id=200844
+        <rdar://problem/54378684>
+
+        Reviewed by Saam Barati.
+
+        * stress/missing-exception-check-in-string-greater-than-compare.js: Added.
+        * stress/missing-exception-check-in-string-greater-than-or-equal-compare.js: Added.
+        * stress/missing-exception-check-in-string-less-than-compare.js: Added.
+        * stress/missing-exception-check-in-string-less-than-or-equal-compare.js: Added.
+
+2019-08-16  Mark Lam  <mark.lam@apple.com>
+
</ins><span class="cx">         CodeBlock destructor should clear all of its watchpoints.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=200792
</span><span class="cx">         <rdar://problem/53947800>
</span></span></pre></div>
<a id="trunkJSTestsstressmissingexceptioncheckinstringgreaterthancomparejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/missing-exception-check-in-string-greater-than-compare.js (0 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/missing-exception-check-in-string-greater-than-compare.js                           (rev 0)
+++ trunk/JSTests/stress/missing-exception-check-in-string-greater-than-compare.js      2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+const s1 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    '' > s1;
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
+
+exception = undefined;
+
+const s2 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    s2 > '';
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
</ins></span></pre></div>
<a id="trunkJSTestsstressmissingexceptioncheckinstringgreaterthanorequalcomparejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/missing-exception-check-in-string-greater-than-or-equal-compare.js (0 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/missing-exception-check-in-string-greater-than-or-equal-compare.js                          (rev 0)
+++ trunk/JSTests/stress/missing-exception-check-in-string-greater-than-or-equal-compare.js     2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+const s1 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    '' >= s1;
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
+
+exception = undefined;
+
+const s2 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    s2 >= '';
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
</ins></span></pre></div>
<a id="trunkJSTestsstressmissingexceptioncheckinstringlessthancomparejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/missing-exception-check-in-string-less-than-compare.js (0 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/missing-exception-check-in-string-less-than-compare.js                              (rev 0)
+++ trunk/JSTests/stress/missing-exception-check-in-string-less-than-compare.js 2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+const s1 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    '' < s1;
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
+
+exception = undefined;
+
+const s2 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    s2 < '';
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
</ins></span></pre></div>
<a id="trunkJSTestsstressmissingexceptioncheckinstringlessthanorequalcomparejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/missing-exception-check-in-string-less-than-or-equal-compare.js (0 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/missing-exception-check-in-string-less-than-or-equal-compare.js                             (rev 0)
+++ trunk/JSTests/stress/missing-exception-check-in-string-less-than-or-equal-compare.js        2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+const s1 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    '' <= s1;
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
+
+exception = undefined;
+
+const s2 = (-1).toLocaleString().padEnd(2**31-1, 'aa');
+try {
+    s2 <= '';
+} catch (e) {
+    exception = e;
+}
+
+if (exception != 'Error: Out of memory')
+    throw "FAILED";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (248801 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-08-16 23:02:16 UTC (rev 248801)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2019-08-16  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><ins>+        More missing exception checks in string comparison operators.
+        https://bugs.webkit.org/show_bug.cgi?id=200844
+        <rdar://problem/54378684>
+
+        Reviewed by Saam Barati.
+
+        * runtime/Operations.h:
+        (JSC::jsLess):
+        (JSC::jsLessEq):
+
+2019-08-16  Mark Lam  <mark.lam@apple.com>
+
</ins><span class="cx">         CodeBlock destructor should clear all of its watchpoints.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=200792
</span><span class="cx">         <rdar://problem/53947800>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Operations.h (248801 => 248802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Operations.h 2019-08-16 23:02:16 UTC (rev 248801)
+++ trunk/Source/JavaScriptCore/runtime/Operations.h    2019-08-16 23:49:27 UTC (rev 248802)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
</span><del>- *  Copyright (C) 2002-2018 Apple Inc. All rights reserved.
</del><ins>+ *  Copyright (C) 2002-2019 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  *  This library is free software; you can redistribute it and/or
</span><span class="cx">  *  modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -352,8 +352,13 @@
</span><span class="cx">     if (v1.isNumber() && v2.isNumber())
</span><span class="cx">         return v1.asNumber() < v2.asNumber();
</span><span class="cx"> 
</span><del>-    if (isJSString(v1) && isJSString(v2))
-        return codePointCompareLessThan(asString(v1)->value(callFrame), asString(v2)->value(callFrame));
</del><ins>+    if (isJSString(v1) && isJSString(v2)) {
+        String s1 = asString(v1)->value(callFrame);
+        RETURN_IF_EXCEPTION(scope, false);
+        String s2 = asString(v2)->value(callFrame);
+        RETURN_IF_EXCEPTION(scope, false);
+        return codePointCompareLessThan(s1, s2);
+    }
</ins><span class="cx"> 
</span><span class="cx">     double n1;
</span><span class="cx">     double n2;
</span><span class="lines">@@ -397,8 +402,13 @@
</span><span class="cx">     if (v1.isNumber() && v2.isNumber())
</span><span class="cx">         return v1.asNumber() <= v2.asNumber();
</span><span class="cx"> 
</span><del>-    if (isJSString(v1) && isJSString(v2))
-        return !codePointCompareLessThan(asString(v2)->value(callFrame), asString(v1)->value(callFrame));
</del><ins>+    if (isJSString(v1) && isJSString(v2)) {
+        String s1 = asString(v1)->value(callFrame);
+        RETURN_IF_EXCEPTION(scope, false);
+        String s2 = asString(v2)->value(callFrame);
+        RETURN_IF_EXCEPTION(scope, false);
+        return !codePointCompareLessThan(s2, s1);
+    }
</ins><span class="cx"> 
</span><span class="cx">     double n1;
</span><span class="cx">     double n2;
</span></span></pre>
</div>
</div>

</body>
</html>