JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / ArrayBufferView.h

diff --git a/runtime/ArrayBufferView.h b/runtime/ArrayBufferView.h
index ea7cd5a8f86c574ac3a716ee5741c87d7a09485e..3fc10b0dd7bb3415d3f701a50e7d6330a316d784 100644 (file)
--- a/runtime/ArrayBufferView.h
+++ b/runtime/ArrayBufferView.h
@@ -77,22 +77,20 @@ public:
 
     JS_EXPORT_PRIVATE virtual ~ArrayBufferView();
 
 
     JS_EXPORT_PRIVATE virtual ~ArrayBufferView();
 

+    // Helper to verify byte offset is size aligned.
+    static bool verifyByteOffsetAlignment(unsigned byteOffset, size_t size)
+    {
+        return !(byteOffset & (size - 1));
+    }
+

     // Helper to verify that a given sub-range of an ArrayBuffer is
     // within range.
     // Helper to verify that a given sub-range of an ArrayBuffer is
     // within range.

-    // 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)
+    static bool verifySubRangeLength(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned numElements, size_t size)

     {
         unsigned byteLength = buffer->byteLength();
     {
         unsigned byteLength = buffer->byteLength();

-        if (sizeof(T) > 1 && byteOffset % sizeof(T))
-            return false;

         if (byteOffset > byteLength)
             return false;
         if (byteOffset > byteLength)
             return false;

-        unsigned remainingElements = (byteLength - byteOffset) / sizeof(T);
+        unsigned remainingElements = (byteLength - byteOffset) / size;

         if (numElements > remainingElements)
             return false;
         return true;
         if (numElements > remainingElements)
             return false;
         return true;