Title: [220330] trunk/Source/_javascript_Core
Revision
220330
Author
keith_mil...@apple.com
Date
2017-08-07 00:03:06 -0700 (Mon, 07 Aug 2017)

Log Message

REGRESSION: wasm.yaml/wasm/js-api/dont-mmap-zero-byte-memory.js failing on JSC Debug bots
https://bugs.webkit.org/show_bug.cgi?id=175256

Reviewed by Saam Barati.

The check in createFromBytes just needed to check that the buffer was not null before
calling isCaged.

* runtime/ArrayBuffer.cpp:
(JSC::ArrayBuffer::createFromBytes):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (220329 => 220330)


--- trunk/Source/_javascript_Core/ChangeLog	2017-08-07 06:06:34 UTC (rev 220329)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-08-07 07:03:06 UTC (rev 220330)
@@ -1,3 +1,16 @@
+2017-08-07  Keith Miller  <keith_mil...@apple.com>
+
+        REGRESSION: wasm.yaml/wasm/js-api/dont-mmap-zero-byte-memory.js failing on JSC Debug bots
+        https://bugs.webkit.org/show_bug.cgi?id=175256
+
+        Reviewed by Saam Barati.
+
+        The check in createFromBytes just needed to check that the buffer was not null before
+        calling isCaged.
+
+        * runtime/ArrayBuffer.cpp:
+        (JSC::ArrayBuffer::createFromBytes):
+
 2017-08-05  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK][WPE] Add API to provide browser information required by automation

Modified: trunk/Source/_javascript_Core/runtime/ArrayBuffer.cpp (220329 => 220330)


--- trunk/Source/_javascript_Core/runtime/ArrayBuffer.cpp	2017-08-07 06:06:34 UTC (rev 220329)
+++ trunk/Source/_javascript_Core/runtime/ArrayBuffer.cpp	2017-08-07 07:03:06 UTC (rev 220330)
@@ -198,7 +198,7 @@
 // - WebAssembly. Wasm should allocate from the cage.
 Ref<ArrayBuffer> ArrayBuffer::createFromBytes(const void* data, unsigned byteLength, ArrayBufferDestructorFunction&& destructor)
 {
-    if (!Gigacage::isCaged(data) && data && byteLength)
+    if (data && byteLength && !Gigacage::isCaged(data))
         Gigacage::disableGigacage();
     
     ArrayBufferContents contents(const_cast<void*>(data), byteLength, WTFMove(destructor));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to