<!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>[208567] 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/208567">208567</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2016-11-10 15:07:15 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: length > offset encountered with wasm.yaml/wasm/js-api/test_Module.js.default-wasm
https://bugs.webkit.org/show_bug.cgi?id=164597
Reviewed by Keith Miller.
JSTests:
Trim the array buffer before returning it: it's optimistically
over-allocated to avoid growing all the time, but when parsed it
can't have extra content.
* wasm/Builder_WebAssemblyBinary.js:
(export.const.Binary):
* wasm/LowLevelBinary.js:
(export.default.LowLevelBinary.prototype.get return):
Source/JavaScriptCore:
* wasm/WasmParser.h:
(JSC::Wasm::Parser::parseVarUInt32): move closer to other parsers
(JSC::Wasm::Parser::parseVarUInt64): move closer to other parsers
Source/WTF:
Decoding at end of file should fail, not assert.
* wtf/LEBDecoder.h:
(WTF::LEBDecoder::decodeUInt):
(WTF::LEBDecoder::decodeInt32):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmBuilder_WebAssemblyBinaryjs">trunk/JSTests/wasm/Builder_WebAssemblyBinary.js</a></li>
<li><a href="#trunkJSTestswasmLowLevelBinaryjs">trunk/JSTests/wasm/LowLevelBinary.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmParserh">trunk/Source/JavaScriptCore/wasm/WasmParser.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfLEBDecoderh">trunk/Source/WTF/wtf/LEBDecoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/JSTests/ChangeLog 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-10 JF Bastien <jfbastien@apple.com>
+
+ ASSERTION FAILED: length > offset encountered with wasm.yaml/wasm/js-api/test_Module.js.default-wasm
+ https://bugs.webkit.org/show_bug.cgi?id=164597
+
+ Reviewed by Keith Miller.
+
+ Trim the array buffer before returning it: it's optimistically
+ over-allocated to avoid growing all the time, but when parsed it
+ can't have extra content.
+
+ * wasm/Builder_WebAssemblyBinary.js:
+ (export.const.Binary):
+ * wasm/LowLevelBinary.js:
+ (export.default.LowLevelBinary.prototype.get return):
+
</ins><span class="cx"> 2016-11-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> test262: DataView / TypedArray methods should throw RangeErrors for negative numbers (ToIndex)
</span></span></pre></div>
<a id="trunkJSTestswasmBuilder_WebAssemblyBinaryjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/Builder_WebAssemblyBinary.js (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/Builder_WebAssemblyBinary.js 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/JSTests/wasm/Builder_WebAssemblyBinary.js 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -103,5 +103,6 @@
</span><span class="cx"> }
</span><span class="cx"> sectionBin.apply();
</span><span class="cx"> }
</span><ins>+ wasmBin.trim();
</ins><span class="cx"> return wasmBin;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkJSTestswasmLowLevelBinaryjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/LowLevelBinary.js (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/LowLevelBinary.js 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/JSTests/wasm/LowLevelBinary.js 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> // Utilities.
</span><span class="cx"> get() { return this._buf; }
</span><span class="cx"> hexdump() { return _hexdump(this._buf, this._used); }
</span><ins>+ trim() { this._buf = this._buf.slice(0, this._used); }
</ins><span class="cx"> _maybeGrow(bytes) {
</span><span class="cx"> const allocated = this._buf.length;
</span><span class="cx"> if (allocated - this._used < bytes) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-10 JF Bastien <jfbastien@apple.com>
+
+ ASSERTION FAILED: length > offset encountered with wasm.yaml/wasm/js-api/test_Module.js.default-wasm
+ https://bugs.webkit.org/show_bug.cgi?id=164597
+
+ Reviewed by Keith Miller.
+
+ * wasm/WasmParser.h:
+ (JSC::Wasm::Parser::parseVarUInt32): move closer to other parsers
+ (JSC::Wasm::Parser::parseVarUInt64): move closer to other parsers
+
</ins><span class="cx"> 2016-11-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> test262: DataView / TypedArray methods should throw RangeErrors for negative numbers (ToIndex)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmParser.h (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmParser.h 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/Source/JavaScriptCore/wasm/WasmParser.h 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -46,15 +46,15 @@
</span><span class="cx"> bool WARN_UNUSED_RETURN consumeString(const char*);
</span><span class="cx"> bool WARN_UNUSED_RETURN consumeUTF8String(String&, size_t);
</span><span class="cx">
</span><del>- bool WARN_UNUSED_RETURN parseVarUInt1(uint8_t& result);
- bool WARN_UNUSED_RETURN parseInt7(int8_t& result);
- bool WARN_UNUSED_RETURN parseUInt7(uint8_t& result);
- bool WARN_UNUSED_RETURN parseUInt32(uint32_t& result);
- bool WARN_UNUSED_RETURN parseVarUInt32(uint32_t& result) { return WTF::LEBDecoder::decodeUInt32(m_source, m_sourceLength, m_offset, result); }
- bool WARN_UNUSED_RETURN parseVarUInt64(uint64_t& result) { return WTF::LEBDecoder::decodeUInt64(m_source, m_sourceLength, m_offset, result); }
</del><ins>+ bool WARN_UNUSED_RETURN parseVarUInt1(uint8_t&);
+ bool WARN_UNUSED_RETURN parseInt7(int8_t&);
+ bool WARN_UNUSED_RETURN parseUInt7(uint8_t&);
+ bool WARN_UNUSED_RETURN parseUInt32(uint32_t&);
+ bool WARN_UNUSED_RETURN parseVarUInt32(uint32_t&);
+ bool WARN_UNUSED_RETURN parseVarUInt64(uint64_t&);
</ins><span class="cx">
</span><del>- bool WARN_UNUSED_RETURN parseValueType(Type& result);
- bool WARN_UNUSED_RETURN parseExternalKind(External::Kind& result);
</del><ins>+ bool WARN_UNUSED_RETURN parseValueType(Type&);
+ bool WARN_UNUSED_RETURN parseExternalKind(External::Kind&);
</ins><span class="cx">
</span><span class="cx"> const uint8_t* source() const { return m_source; }
</span><span class="cx"> size_t length() const { return m_sourceLength; }
</span><span class="lines">@@ -112,6 +112,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ALWAYS_INLINE bool Parser::parseVarUInt32(uint32_t& result)
+{
+ return WTF::LEBDecoder::decodeUInt32(m_source, m_sourceLength, m_offset, result);
+}
+
+ALWAYS_INLINE bool Parser::parseVarUInt64(uint64_t& result)
+{
+ return WTF::LEBDecoder::decodeUInt64(m_source, m_sourceLength, m_offset, result);
+}
+
</ins><span class="cx"> ALWAYS_INLINE bool Parser::parseUInt32(uint32_t& result)
</span><span class="cx"> {
</span><span class="cx"> if (length() < 4 || m_offset > length() - 4)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/Source/WTF/ChangeLog 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-10 JF Bastien <jfbastien@apple.com>
+
+ ASSERTION FAILED: length > offset encountered with wasm.yaml/wasm/js-api/test_Module.js.default-wasm
+ https://bugs.webkit.org/show_bug.cgi?id=164597
+
+ Reviewed by Keith Miller.
+
+ Decoding at end of file should fail, not assert.
+
+ * wtf/LEBDecoder.h:
+ (WTF::LEBDecoder::decodeUInt):
+ (WTF::LEBDecoder::decodeInt32):
+
</ins><span class="cx"> 2016-11-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unused CFURLCACHE code
</span></span></pre></div>
<a id="trunkSourceWTFwtfLEBDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/LEBDecoder.h (208566 => 208567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/LEBDecoder.h 2016-11-10 23:03:28 UTC (rev 208566)
+++ trunk/Source/WTF/wtf/LEBDecoder.h 2016-11-10 23:07:15 UTC (rev 208567)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx"> template<size_t maxByteLength, typename T>
</span><span class="cx"> inline bool WARN_UNUSED_RETURN decodeUInt(const uint8_t* bytes, size_t length, size_t& offset, T& result)
</span><span class="cx"> {
</span><del>- ASSERT(length > offset);
</del><ins>+ if (length <= offset)
+ return false;
</ins><span class="cx"> result = 0;
</span><span class="cx"> unsigned shift = 0;
</span><span class="cx"> size_t last = std::min(maxByteLength, length - offset - 1);
</span><span class="lines">@@ -69,7 +70,8 @@
</span><span class="cx">
</span><span class="cx"> inline bool WARN_UNUSED_RETURN decodeInt32(const uint8_t* bytes, size_t length, size_t& offset, int32_t& result)
</span><span class="cx"> {
</span><del>- ASSERT(length > offset);
</del><ins>+ if (length <= offset)
+ return false;
</ins><span class="cx"> result = 0;
</span><span class="cx"> unsigned shift = 0;
</span><span class="cx"> size_t last = std::min(max32BitLEBByteLength, length - offset - 1);
</span></span></pre>
</div>
</div>
</body>
</html>