mozilla-beta: changeset 308956:3a5c79d9350404a65860e0663d2036a0708df5f5

author	Morris Tseng <mtseng@mozilla.com>
	Tue, 01 Dec 2015 10:16:12 +0800
changeset 308956	3a5c79d9350404a65860e0663d2036a0708df5f5
parent 308955	ae9f5883e654131f73236505da292faff9fc06be
child 308957	a9f0334501a97f1026aaa651ecbe760762abcef5
push id	5513
push user	raliiev@mozilla.com
push date	Mon, 25 Jan 2016 13:55:34 +0000
treeherder	mozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jgilbert
bugs	1228488
milestone	45.0a1
first release with	nightly linux32 470f4f8c2b2d / 45.0a1 / 20151202030210 / files nightly linux64 470f4f8c2b2d / 45.0a1 / 20151202030210 / files nightly mac 470f4f8c2b2d / 45.0a1 / 20151202030210 / files nightly win32 470f4f8c2b2d / 45.0a1 / 20151202030210 / files nightly win64 470f4f8c2b2d / 45.0a1 / 20151202030210 / files
last release without	nightly linux32 47b49b0d3236 / 45.0a1 / 20151130030228 / files nightly linux64 47b49b0d3236 / 45.0a1 / 20151130030228 / files nightly mac 47b49b0d3236 / 45.0a1 / 20151130030228 / files nightly win32 47b49b0d3236 / 45.0a1 / 20151130030228 / files nightly win64 47b49b0d3236 / 45.0a1 / 20151130030228 / files

--- a/dom/canvas/WebGL2ContextUniforms.cpp
+++ b/dom/canvas/WebGL2ContextUniforms.cpp
@@ -320,16 +320,21 @@ WebGL2Context::GetActiveUniforms(WebGLPr
                                  const dom::Sequence<GLuint>& uniformIndices,
                                  GLenum pname,
                                  dom::Nullable< nsTArray<GLint> >& retval)
 {
     retval.SetNull();
     if (IsContextLost())
         return;
 
+    if (pname == LOCAL_GL_UNIFORM_NAME_LENGTH) {
+        ErrorInvalidEnumInfo("getActiveUniforms: pname", pname);
+        return;
+    }
+
     if (!ValidateObject("getActiveUniforms: program", program))
         return;
 
     size_t count = uniformIndices.Length();
     if (!count)
         return;
 
     GLuint progname = program->mGLName;