Bug 1303879 - Disallow NONE GetFramebufferAttachmentParameter. - r=mtseng draft
authorJeff Gilbert <jgilbert@mozilla.com>
Thu, 01 Sep 2016 16:19:50 -0700
changeset 415743 4f35f8de28e20d45283fd8712150c8ed28976ab0
parent 415742 402774b640b48e6bb59abf9f16fac5268028f6e1
child 415744 7970e8fccc1756b7afff4a5a35baddd4245b34b4
push id29953
push userbmo:jgilbert@mozilla.com
push dateTue, 20 Sep 2016 23:29:17 +0000
reviewersmtseng
bugs1303879
milestone51.0a1
Bug 1303879 - Disallow NONE GetFramebufferAttachmentParameter. - r=mtseng MozReview-Commit-ID: GizkMvHb7FG
dom/canvas/WebGLFramebuffer.cpp
--- a/dom/canvas/WebGLFramebuffer.cpp
+++ b/dom/canvas/WebGLFramebuffer.cpp
@@ -1465,17 +1465,17 @@ WebGLFramebuffer::FramebufferTextureLaye
 }
 
 JS::Value
 WebGLFramebuffer::GetAttachmentParameter(const char* funcName, JSContext* cx,
                                          GLenum target, GLenum attachEnum, GLenum pname,
                                          ErrorResult* const out_error)
 {
     const auto maybeAttach = GetAttachPoint(attachEnum);
-    if (!maybeAttach) {
+    if (!maybeAttach || attachEnum == LOCAL_GL_NONE) {
         mContext->ErrorInvalidEnum("%s: Can only query COLOR_ATTACHMENTi,"
                                    " DEPTH_ATTACHMENT, DEPTH_STENCIL_ATTACHMENT, or"
                                    " STENCIL_ATTACHMENT for a framebuffer.",
                                    funcName);
         return JS::NullValue();
     }
     auto attach = maybeAttach.value();