<!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>[245645] 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/245645">245645</a></dd>
<dt>Author</dt> <dd>tzagallo@apple.com</dd>
<dt>Date</dt> <dd>2019-05-22 14:01:40 -0700 (Wed, 22 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stack-buffer-overflow in decodeURIComponent
https://bugs.webkit.org/show_bug.cgi?id=198109
<rdar://problem/50397550>

Reviewed by Michael Saboff.

JSTests:

* stress/decode-uri-icu-count-trail-bytes.js: Added.
(i.j.try.i.toString):
(i.j.catch):

Source/JavaScriptCore:

Since <a href="http://trac.webkit.org/projects/webkit/changeset/244828">r244828</a> we started using U8_MAX_LENGTH to determine the size of the buffer and
U8_COUNT_TRAIL_BYTES when decoding UTF-8 sequences in JSC::decode. However, U8_MAX_LENGTH
is defined as 4 and in pre-60 ICU U8_COUNT_TRAIL_BYTES returns 0..5.

* runtime/JSGlobalObjectFunctions.cpp:
(JSC::decode):</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="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressdecodeuriicucounttrailbytesjs">trunk/JSTests/stress/decode-uri-icu-count-trail-bytes.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (245644 => 245645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2019-05-22 20:58:32 UTC (rev 245644)
+++ trunk/JSTests/ChangeLog     2019-05-22 21:01:40 UTC (rev 245645)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-05-22  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Stack-buffer-overflow in decodeURIComponent
+        https://bugs.webkit.org/show_bug.cgi?id=198109
+        <rdar://problem/50397550>
+
+        Reviewed by Michael Saboff.
+
+        * stress/decode-uri-icu-count-trail-bytes.js: Added.
+        (i.j.try.i.toString):
+        (i.j.catch):
+
</ins><span class="cx"> 2019-05-22  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Don't clear PropertyNameArray in Proxy code
</span></span></pre></div>
<a id="trunkJSTestsstressdecodeuriicucounttrailbytesjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/decode-uri-icu-count-trail-bytes.js (0 => 245645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/decode-uri-icu-count-trail-bytes.js                         (rev 0)
+++ trunk/JSTests/stress/decode-uri-icu-count-trail-bytes.js    2019-05-22 21:01:40 UTC (rev 245645)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+const rest = new Array(14).fill("%00").join('');
+const uri = `%fd%f0%f0%f0%ff%ff%ff${rest}`;
+for (let i = 0; i < 256; i++) {
+    for (let j = 0; j < 256; j++) {
+        try {
+            decodeURIComponent(`${uri}%${i.toString(16)}%${j.toString(16)}%ff%ff%ff%ff%ff`);
+        } catch (err) {
+        }
+    }
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (245644 => 245645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-05-22 20:58:32 UTC (rev 245644)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-05-22 21:01:40 UTC (rev 245645)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-05-22  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Stack-buffer-overflow in decodeURIComponent
+        https://bugs.webkit.org/show_bug.cgi?id=198109
+        <rdar://problem/50397550>
+
+        Reviewed by Michael Saboff.
+
+        Since r244828 we started using U8_MAX_LENGTH to determine the size of the buffer and
+        U8_COUNT_TRAIL_BYTES when decoding UTF-8 sequences in JSC::decode. However, U8_MAX_LENGTH
+        is defined as 4 and in pre-60 ICU U8_COUNT_TRAIL_BYTES returns 0..5.
+
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::decode):
+
</ins><span class="cx"> 2019-05-22  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Don't clear PropertyNameArray in Proxy code
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (245644 => 245645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp  2019-05-22 20:58:32 UTC (rev 245644)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp     2019-05-22 21:01:40 UTC (rev 245645)
</span><span class="lines">@@ -184,7 +184,12 @@
</span><span class="cx">                 const int sequenceLen = 1 + U8_COUNT_TRAIL_BYTES(b0);
</span><span class="cx">                 if (k <= length - sequenceLen * 3) {
</span><span class="cx">                     charLen = sequenceLen * 3;
</span><ins>+#if U_ICU_VERSION_MAJOR_NUM >= 60
</ins><span class="cx">                     uint8_t sequence[U8_MAX_LENGTH];
</span><ins>+#else
+                    // In pre-60 ICU, U8_COUNT_TRAIL_BYTES returns 0..5
+                    uint8_t sequence[6];
+#endif
</ins><span class="cx">                     sequence[0] = b0;
</span><span class="cx">                     for (int i = 1; i < sequenceLen; ++i) {
</span><span class="cx">                         const CharType* q = p + i * 3;
</span></span></pre>
</div>
</div>

</body>
</html>