<!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>[206794] 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/206794">206794</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2016-10-04 16:25:33 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: handle a few corner cases
https://bugs.webkit.org/show_bug.cgi?id=162884
Reviewed by Keith Miller.
JSTests:
* stress/wasm/generate-wasmops-header.js:
(const.opcodeIterator): max opcode value
Source/JavaScriptCore:
* wasm/JSWASMModule.cpp: missing include broke cmake build
* wasm/WASMFunctionParser.h:
(JSC::WASM::FunctionParser<Context>::parseBlock): check op is valid
(JSC::WASM::FunctionParser<Context>::parseExpression): switch covers all cases
* wasm/WASMOps.h:
(JSC::WASM::isValidOpType): op is valid
* wasm/WASMParser.h:
(JSC::WASM::Parser::consumeString): avoid str[i] being one-past-the-end
(JSC::WASM::Parser::parseUInt32): shift math around to avoid overflow</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstresswasmgeneratewasmopsheaderjs">trunk/JSTests/stress/wasm/generate-wasmops-header.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmJSWASMModulecpp">trunk/Source/JavaScriptCore/wasm/JSWASMModule.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionParserh">trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMOpsh">trunk/Source/JavaScriptCore/wasm/WASMOps.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMParserh">trunk/Source/JavaScriptCore/wasm/WASMParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/JSTests/ChangeLog 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-04 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: handle a few corner cases
+ https://bugs.webkit.org/show_bug.cgi?id=162884
+
+ Reviewed by Keith Miller.
+
+ * stress/wasm/generate-wasmops-header.js:
+ (const.opcodeIterator): max opcode value
+
</ins><span class="cx"> 2016-10-03 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> Auto-generate WASMOps.h, share with testing JSON file
</span></span></pre></div>
<a id="trunkJSTestsstresswasmgeneratewasmopsheaderjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/wasm/generate-wasmops-header.js (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/wasm/generate-wasmops-header.js 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/JSTests/stress/wasm/generate-wasmops-header.js 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx"> const wasm = JSON.parse(read(jsonFile));
</span><span class="cx"> const opcodes = wasm.opcode;
</span><span class="cx">
</span><del>-// Iterate through opcodes which match filter.
-const opcodeIterator = (filter) => {
</del><ins>+// Iterate through opcodes which match filter, and on each iteration yield ret.
+const opcodeIterator = (filter, ret = op => { return {name: op, opcode: opcodes[op]}; }) => {
</ins><span class="cx"> return function*() {
</span><span class="cx"> for (let op in opcodes)
</span><span class="cx"> if (filter(opcodes[op]))
</span><del>- yield {name: op, opcode: opcodes[op]};
</del><ins>+ yield ret(op);
</ins><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -38,6 +38,21 @@
</span><span class="cx"> ...opcodeMacroizer(op => (op.category === "arithmetic" || op.category === "comparison") && op.parameter.length === 2),
</span><span class="cx"> "\n\n"].join("");
</span><span class="cx">
</span><ins>+const opValueSet = new Set(opcodeIterator(op => true, op => opcodes[op].value)());
+const maxOpValue = Math.max(...opValueSet);
+const validOps = (() => {
+ // Create a bitset of valid ops.
+ let v = "";
+ for (let i = 0; i < maxOpValue / 8; ++i) {
+ let entry = 0;
+ for (let j = 0; j < 8; ++j)
+ if (opValueSet.has(i * 8 + j))
+ entry |= 1 << j;
+ v += (i ? ", " : "") + "0x" + entry.toString(16);
+ }
+ return v;
+})();
+
</ins><span class="cx"> const template = `/*
</span><span class="cx"> * Copyright (C) 2016 Apple Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -69,6 +84,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><ins>+#include <cstdint>
+
</ins><span class="cx"> namespace JSC { namespace WASM {
</span><span class="cx">
</span><span class="cx"> ${defines}
</span><span class="lines">@@ -85,6 +102,14 @@
</span><span class="cx"> FOR_EACH_WASM_OP(CREATE_ENUM_VALUE)
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename Int>
+inline bool isValidOpType(Int i)
+{
+ // Bitset of valid ops.
+ static const uint8_t valid[] = { ${validOps} };
+ return 0 <= i && i <= ${maxOpValue} && (valid[i / 8] & (1 << (i % 8)));
+}
+
</ins><span class="cx"> enum class BinaryOpType : uint8_t {
</span><span class="cx"> FOR_EACH_WASM_BINARY_OP(CREATE_ENUM_VALUE)
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-04 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: handle a few corner cases
+ https://bugs.webkit.org/show_bug.cgi?id=162884
+
+ Reviewed by Keith Miller.
+
+ * wasm/JSWASMModule.cpp: missing include broke cmake build
+ * wasm/WASMFunctionParser.h:
+ (JSC::WASM::FunctionParser<Context>::parseBlock): check op is valid
+ (JSC::WASM::FunctionParser<Context>::parseExpression): switch covers all cases
+ * wasm/WASMOps.h:
+ (JSC::WASM::isValidOpType): op is valid
+ * wasm/WASMParser.h:
+ (JSC::WASM::Parser::consumeString): avoid str[i] being one-past-the-end
+ (JSC::WASM::Parser::parseUInt32): shift math around to avoid overflow
+
</ins><span class="cx"> 2016-10-04 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r206778): Release JSC test ChakraCore.yaml/ChakraCore/test/Error/validate_line_column.js.default failing
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmJSWASMModulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/JSWASMModule.cpp (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/JSWASMModule.cpp 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/Source/JavaScriptCore/wasm/JSWASMModule.cpp 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "SlotVisitorInlines.h"
</span><ins>+#include "StructureInlines.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> {
</span><span class="cx"> while (true) {
</span><span class="cx"> uint8_t op;
</span><del>- if (!parseUInt7(op))
</del><ins>+ if (!parseUInt7(op) || !isValidOpType(op))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (verbose) {
</span><span class="lines">@@ -260,8 +260,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Unknown opcode.
- return false;
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Context>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMOpsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMOps.h (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMOps.h 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/Source/JavaScriptCore/wasm/WASMOps.h 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><ins>+#include <cstdint>
+
</ins><span class="cx"> namespace JSC { namespace WASM {
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WASM_SPECIAL_OP(macro) \
</span><span class="lines">@@ -171,6 +173,14 @@
</span><span class="cx"> FOR_EACH_WASM_OP(CREATE_ENUM_VALUE)
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename Int>
+inline bool isValidOpType(Int i)
+{
+ // Bitset of valid ops.
+ static const uint8_t valid[] = { 0xff, 0x8f, 0xff, 0x2, 0xff, 0xff, 0x7f, 0xa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f };
+ return 0 <= i && i <= 188 && (valid[i / 8] & (1 << (i % 8)));
+}
+
</ins><span class="cx"> enum class BinaryOpType : uint8_t {
</span><span class="cx"> FOR_EACH_WASM_BINARY_OP(CREATE_ENUM_VALUE)
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMParser.h (206793 => 206794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMParser.h 2016-10-04 23:20:39 UTC (rev 206793)
+++ trunk/Source/JavaScriptCore/wasm/WASMParser.h 2016-10-04 23:25:33 UTC (rev 206794)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> ALWAYS_INLINE bool Parser::consumeString(const char* str)
</span><span class="cx"> {
</span><span class="cx"> unsigned start = m_offset;
</span><ins>+ if (m_offset >= m_sourceLength)
+ return false;
</ins><span class="cx"> for (unsigned i = 0; str[i]; i++) {
</span><span class="cx"> if (!consumeCharacter(str[i])) {
</span><span class="cx"> m_offset = start;
</span><span class="lines">@@ -90,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool Parser::parseUInt32(uint32_t& result)
</span><span class="cx"> {
</span><del>- if (m_offset + 4 >= m_sourceLength)
</del><ins>+ if (m_sourceLength < 4 || m_offset >= m_sourceLength - 4)
</ins><span class="cx"> return false;
</span><span class="cx"> result = *reinterpret_cast<const uint32_t*>(m_source.data() + m_offset);
</span><span class="cx"> m_offset += 4;
</span></span></pre>
</div>
</div>
</body>
</html>