Changeset 242826 in webkit

Timestamp:

Mar 12, 2019, 1:57:43 PM (7 years ago)

Author:

dino@apple.com

Message:

[WebGL] WebGLBuffer can be too large
​https://bugs.webkit.org/show_bug.cgi?id=195068
<rdar://problem/48414289>

Reviewed by Antoine Quint.

Source/WebCore:

When creating an element array buffer, make sure to
test against the maximum size of an ArrayBuffer, rather
than just assume it can be created.

Test: fast/canvas/webgl/largeBuffer.html

• html/canvas/WebGLBuffer.cpp:

(WebCore::WebGLBuffer::associateBufferDataImpl):

LayoutTests:

• fast/canvas/webgl/largeBuffer-expected.txt: Added.
• fast/canvas/webgl/largeBuffer.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/largeBuffer-expected.txt (added)
• LayoutTests/fast/canvas/webgl/largeBuffer.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLBuffer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-12  Dean Jackson  <dino@apple.com>
+
+        [WebGL] WebGLBuffer can be too large
+        https://bugs.webkit.org/show_bug.cgi?id=195068
+        <rdar://problem/48414289>
+
+        Reviewed by Antoine Quint.
+
+        * fast/canvas/webgl/largeBuffer-expected.txt: Added.
+        * fast/canvas/webgl/largeBuffer.html: Added.
+
 2019-03-12  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-12  Dean Jackson  <dino@apple.com>
+
+        [WebGL] WebGLBuffer can be too large
+        https://bugs.webkit.org/show_bug.cgi?id=195068
+        <rdar://problem/48414289>
+
+        Reviewed by Antoine Quint.
+
+        When creating an element array buffer, make sure to
+        test against the maximum size of an ArrayBuffer, rather
+        than just assume it can be created.
+
+        Test: fast/canvas/webgl/largeBuffer.html
+
+        * html/canvas/WebGLBuffer.cpp:
+        (WebCore::WebGLBuffer::associateBufferDataImpl):
+
 2019-03-12  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLBuffer.cpp

@@ -63 +63 @@
     switch (m_target) {
     case GraphicsContext3D::ELEMENT_ARRAY_BUFFER:
+        if (byteLength > std::numeric_limits<unsigned>::max())
+            return false;
         m_byteLength = byteLength;
         clearCachedMaxIndices();