<!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>[171323] 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/171323">171323</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-21 17:26:19 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>new Int32Array(new ArrayBuffer(100), 1, 1) shouldn't throw an error that says "RangeError: Byte offset and length out of range of buffer"
https://bugs.webkit.org/show_bug.cgi?id=125391
Patch by Diego Pino Garcia <dpino@igalia.com> on 2014-07-21
Reviewed by Darin Adler.
Source/JavaScriptCore:
Create own method for verifying byte offset alignment.
* runtime/ArrayBufferView.h:
(JSC::ArrayBufferView::verifyByteOffsetAlignment):
(JSC::ArrayBufferView::verifySubRangeLength):
(JSC::ArrayBufferView::verifySubRange): Deleted.
* runtime/GenericTypedArrayViewInlines.h:
(JSC::GenericTypedArrayView<Adaptor>::create):
* runtime/JSDataView.cpp:
(JSC::JSDataView::create):
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayView<Adaptor>::create):
LayoutTests:
* fast/canvas/webgl/data-view-crash-expected.txt:
* fast/canvas/webgl/data-view-test-expected.txt:
* fast/canvas/webgl/data-view-test.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgldataviewcrashexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/data-view-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgldataviewtestexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/data-view-test-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgldataviewtesthtml">trunk/LayoutTests/fast/canvas/webgl/data-view-test.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayBufferViewh">trunk/Source/JavaScriptCore/runtime/ArrayBufferView.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGenericTypedArrayViewInlinesh">trunk/Source/JavaScriptCore/runtime/GenericTypedArrayViewInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSDataViewcpp">trunk/Source/JavaScriptCore/runtime/JSDataView.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/LayoutTests/ChangeLog 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-21 Diego Pino Garcia <dpino@igalia.com>
+
+ new Int32Array(new ArrayBuffer(100), 1, 1) shouldn't throw an error that says "RangeError: Byte offset and length out of range of buffer"
+ https://bugs.webkit.org/show_bug.cgi?id=125391
+
+ Reviewed by Darin Adler.
+
+ * fast/canvas/webgl/data-view-crash-expected.txt:
+ * fast/canvas/webgl/data-view-test-expected.txt:
+ * fast/canvas/webgl/data-view-test.html:
+
</ins><span class="cx"> 2014-07-21 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: fast/layers/no-clipping-overflow-hidden-added-after-transform.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgldataviewcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/data-view-crash-expected.txt (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/data-view-crash-expected.txt 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/LayoutTests/fast/canvas/webgl/data-view-crash-expected.txt 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -2,8 +2,8 @@
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><del>-PASS view = new DataView(array.buffer, -4500000000) threw exception RangeError: Byte offset and length out of range of buffer.
-PASS view = new DataView(array.buffer, -4500000000, 4500000000) threw exception RangeError: Byte offset and length out of range of buffer.
</del><ins>+PASS view = new DataView(array.buffer, -4500000000) threw exception RangeError: Length out of range of buffer.
+PASS view = new DataView(array.buffer, -4500000000, 4500000000) threw exception RangeError: Length out of range of buffer.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgldataviewtestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/data-view-test-expected.txt (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/data-view-test-expected.txt 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/LayoutTests/fast/canvas/webgl/data-view-test-expected.txt 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -7,25 +7,31 @@
</span><span class="cx"> PASS DataView(new ArrayBuffer) threw exception
</span><span class="cx">
</span><span class="cx"> Test for constructor taking 1 argument
</span><del>-PASS view = new DataView(arayBuffer) is defined.
</del><ins>+PASS view = new DataView(arrayBuffer) is defined.
</ins><span class="cx"> PASS view.byteOffset is 0
</span><span class="cx"> PASS view.byteLength is 2
</span><span class="cx">
</span><span class="cx"> Test for constructor taking 2 arguments
</span><del>-PASS view = new DataView(arayBuffer, 1) is defined.
</del><ins>+PASS view = new DataView(arrayBuffer, 1) is defined.
</ins><span class="cx"> PASS view.byteOffset is 1
</span><span class="cx"> PASS view.byteLength is 1
</span><span class="cx">
</span><span class="cx"> Test for constructor taking 3 arguments
</span><del>-PASS view = new DataView(arayBuffer, 0, 1) is defined.
</del><ins>+PASS view = new DataView(arrayBuffer, 0, 1) is defined.
</ins><span class="cx"> PASS view.byteOffset is 0
</span><span class="cx"> PASS view.byteLength is 1
</span><span class="cx">
</span><span class="cx"> Test for constructor throwing exception
</span><del>-PASS view = new DataView(arayBuffer, 0, 3) threw exception RangeError: Byte offset and length out of range of buffer.
-PASS view = new DataView(arayBuffer, 1, 2) threw exception RangeError: Byte offset and length out of range of buffer.
-PASS view = new DataView(arayBuffer, 2, 1) threw exception RangeError: Byte offset and length out of range of buffer.
</del><ins>+PASS view = new DataView(arrayBuffer, 0, 3) threw exception RangeError: Length out of range of buffer.
+PASS view = new DataView(arrayBuffer, 1, 2) threw exception RangeError: Length out of range of buffer.
+PASS view = new DataView(arrayBuffer, 2, 1) threw exception RangeError: Length out of range of buffer.
</ins><span class="cx">
</span><ins>+Test for constructor throwing wrong byteoffset exception
+PASS view = new Int32Array(new ArrayBuffer(100), 1, 1) threw exception RangeError: Byte offset is not aligned.
+
+Test for constructor wrong length exception takes precedence over wrong byteoffset exception
+PASS view = new Int32Array(new ArrayBuffer(100), 1, 101) threw exception RangeError: Length out of range of buffer.
+
</ins><span class="cx"> Test for get methods that work
</span><span class="cx"> PASS view.getInt8(0) is 0
</span><span class="cx"> PASS view.getInt8(8) is -128
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgldataviewtesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/data-view-test.html (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/data-view-test.html 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/LayoutTests/fast/canvas/webgl/data-view-test.html 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> function runConstructorTests()
</span><span class="cx"> {
</span><del>- arayBuffer = (new Uint8Array([1, 2])).buffer;
</del><ins>+ arrayBuffer = (new Uint8Array([1, 2])).buffer;
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test for constructor not called as a function");
</span><span class="lines">@@ -245,27 +245,35 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test for constructor taking 1 argument");
</span><del>- shouldBeDefined("view = new DataView(arayBuffer)");
</del><ins>+ shouldBeDefined("view = new DataView(arrayBuffer)");
</ins><span class="cx"> shouldBe("view.byteOffset", "0");
</span><span class="cx"> shouldBe("view.byteLength", "2");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test for constructor taking 2 arguments");
</span><del>- shouldBeDefined("view = new DataView(arayBuffer, 1)");
</del><ins>+ shouldBeDefined("view = new DataView(arrayBuffer, 1)");
</ins><span class="cx"> shouldBe("view.byteOffset", "1");
</span><span class="cx"> shouldBe("view.byteLength", "1");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test for constructor taking 3 arguments");
</span><del>- shouldBeDefined("view = new DataView(arayBuffer, 0, 1)");
</del><ins>+ shouldBeDefined("view = new DataView(arrayBuffer, 0, 1)");
</ins><span class="cx"> shouldBe("view.byteOffset", "0");
</span><span class="cx"> shouldBe("view.byteLength", "1");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test for constructor throwing exception");
</span><del>- shouldThrow("view = new DataView(arayBuffer, 0, 3)");
- shouldThrow("view = new DataView(arayBuffer, 1, 2)");
- shouldThrow("view = new DataView(arayBuffer, 2, 1)");
</del><ins>+ shouldThrow("view = new DataView(arrayBuffer, 0, 3)");
+ shouldThrow("view = new DataView(arrayBuffer, 1, 2)");
+ shouldThrow("view = new DataView(arrayBuffer, 2, 1)");
+
+ debug("");
+ debug("Test for constructor throwing wrong byteoffset exception");
+ shouldThrow("view = new Int32Array(new ArrayBuffer(100), 1, 1)");
+
+ debug("");
+ debug("Test for constructor wrong length exception takes precedence over wrong byteoffset exception");
+ shouldThrow("view = new Int32Array(new ArrayBuffer(100), 1, 101)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function runGetTests()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-21 Diego Pino Garcia <dpino@igalia.com>
+
+ new Int32Array(new ArrayBuffer(100), 1, 1) shouldn't throw an error that says "RangeError: Byte offset and length out of range of buffer"
+ https://bugs.webkit.org/show_bug.cgi?id=125391
+
+ Reviewed by Darin Adler.
+
+ Create own method for verifying byte offset alignment.
+
+ * runtime/ArrayBufferView.h:
+ (JSC::ArrayBufferView::verifyByteOffsetAlignment):
+ (JSC::ArrayBufferView::verifySubRangeLength):
+ (JSC::ArrayBufferView::verifySubRange): Deleted.
+ * runtime/GenericTypedArrayViewInlines.h:
+ (JSC::GenericTypedArrayView<Adaptor>::create):
+ * runtime/JSDataView.cpp:
+ (JSC::JSDataView::create):
+ * runtime/JSGenericTypedArrayViewInlines.h:
+ (JSC::JSGenericTypedArrayView<Adaptor>::create):
+
</ins><span class="cx"> 2014-07-20 Diego Pino Garcia <dpino@igalia.com>
</span><span class="cx">
</span><span class="cx"> ES6: Implement Math.sign()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayBufferViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayBufferView.h (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayBufferView.h 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/Source/JavaScriptCore/runtime/ArrayBufferView.h 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -77,22 +77,20 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE virtual ~ArrayBufferView();
</span><span class="cx">
</span><ins>+ // Helper to verify byte offset is size aligned.
+ static bool verifyByteOffsetAlignment(unsigned byteOffset, size_t size)
+ {
+ return !(byteOffset & (size - 1));
+ }
+
</ins><span class="cx"> // Helper to verify that a given sub-range of an ArrayBuffer is
</span><span class="cx"> // within range.
</span><del>- // FIXME: This should distinguish between alignment errors and bounds errors.
- // https://bugs.webkit.org/show_bug.cgi?id=125391
- template <typename T>
- static bool verifySubRange(
- PassRefPtr<ArrayBuffer> buffer,
- unsigned byteOffset,
- unsigned numElements)
</del><ins>+ static bool verifySubRangeLength(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned numElements, size_t size)
</ins><span class="cx"> {
</span><span class="cx"> unsigned byteLength = buffer->byteLength();
</span><del>- if (sizeof(T) > 1 && byteOffset % sizeof(T))
- return false;
</del><span class="cx"> if (byteOffset > byteLength)
</span><span class="cx"> return false;
</span><del>- unsigned remainingElements = (byteLength - byteOffset) / sizeof(T);
</del><ins>+ unsigned remainingElements = (byteLength - byteOffset) / size;
</ins><span class="cx"> if (numElements > remainingElements)
</span><span class="cx"> return false;
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGenericTypedArrayViewInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GenericTypedArrayViewInlines.h (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GenericTypedArrayViewInlines.h 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/Source/JavaScriptCore/runtime/GenericTypedArrayViewInlines.h 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -62,8 +62,10 @@
</span><span class="cx"> PassRefPtr<ArrayBuffer> passedBuffer, unsigned byteOffset, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ArrayBuffer> buffer = passedBuffer;
</span><del>- if (!verifySubRange<typename Adaptor::Type>(buffer, byteOffset, length))
- return 0;
</del><ins>+ if (!verifySubRangeLength(buffer, byteOffset, length, sizeof(typename Adaptor::Type))
+ || !verifyByteOffsetAlignment(byteOffset, sizeof(typename Adaptor::Type))) {
+ return nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> return adoptRef(new GenericTypedArrayView(buffer, byteOffset, length));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSDataViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSDataView.cpp (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSDataView.cpp 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/Source/JavaScriptCore/runtime/JSDataView.cpp 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -47,11 +47,14 @@
</span><span class="cx"> unsigned byteOffset, unsigned byteLength)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ArrayBuffer> buffer = passedBuffer;
</span><del>- if (!ArrayBufferView::verifySubRange<uint8_t>(buffer, byteOffset, byteLength)) {
- throwVMError(
- exec, createRangeError(exec, "Byte offset and length out of range of buffer"));
- return 0;
</del><ins>+ if (!ArrayBufferView::verifySubRangeLength(buffer, byteOffset, byteLength, sizeof(uint8_t))) {
+ throwVMError(exec, createRangeError(exec, "Length out of range of buffer"));
+ return nullptr;
</ins><span class="cx"> }
</span><ins>+ if (!ArrayBufferView::verifyByteOffsetAlignment(byteOffset, sizeof(uint8_t))) {
+ exec->vm().throwException(exec, createRangeError(exec, "Byte offset is not aligned"));
+ return nullptr;
+ }
</ins><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> ConstructionContext context(
</span><span class="cx"> structure, buffer, byteOffset, byteLength, ConstructionContext::DataView);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h (171322 => 171323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2014-07-22 00:10:11 UTC (rev 171322)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2014-07-22 00:26:19 UTC (rev 171323)
</span><span class="lines">@@ -83,11 +83,15 @@
</span><span class="cx"> unsigned byteOffset, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ArrayBuffer> buffer = passedBuffer;
</span><del>- if (!ArrayBufferView::verifySubRange<typename Adaptor::Type>(buffer, byteOffset, length)) {
- exec->vm().throwException(
- exec, createRangeError(exec, "Byte offset and length out of range of buffer"));
- return 0;
</del><ins>+ size_t size = sizeof(typename Adaptor::Type);
+ if (!ArrayBufferView::verifySubRangeLength(buffer, byteOffset, length, size)) {
+ exec->vm().throwException(exec, createRangeError(exec, "Length out of range of buffer"));
+ return nullptr;
</ins><span class="cx"> }
</span><ins>+ if (!ArrayBufferView::verifyByteOffsetAlignment(byteOffset, size)) {
+ exec->vm().throwException(exec, createRangeError(exec, "Byte offset is not aligned"));
+ return nullptr;
+ }
</ins><span class="cx"> ConstructionContext context(exec->vm(), structure, buffer, byteOffset, length);
</span><span class="cx"> ASSERT(context);
</span><span class="cx"> JSGenericTypedArrayView* result =
</span></span></pre>
</div>
</div>
</body>
</html>