commit fc32e8b7ff45549b61d3c2df1d6a42a78a437594
author Geoff Lang <geofflang@chromium.org> Wed May 31 14:16:59 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Jun 01 19:30:31 2017 +0000
tree cb479c4feea9e502ae95f202d304cffacc69d07f
parent 948bbe51db337f51603098abda345be66a4c15c9

WebGL: Validate shader entry point names do not contain invalid characters.

Section 6.20 of the WebGL spec states that all shader-related entry points
that accept strings must validate that the string does not contain
characters that are not valid in ESSL.

TEST=conformance/misc/invalid-passed-params
BUG=2016

Change-Id: I220d9dd79c4b0e8e0195277093268b9e1e66f9d9
Reviewed-on: https://chromium-review.googlesource.com/519445
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/tests/gl_tests/WebGLCompatibilityTest.cpp

diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
index d0e87d1..cf720ba 100644
--- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
@@ -837,6 +837,78 @@
     }
 }
 
+// Test that binding/querying uniforms and attributes with invalid names generates errors
+TEST_P(WebGLCompatibilityTest, InvalidAttributeAndUniformNames)
+{
+    const std::string validAttribName =
+        "abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+    const std::string validUniformName =
+        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_1234567890";
+    const char invalidSet[] = {'"', '$', '`', '@', '\\', '\''};
+
+    std::string vert = "attribute float ";
+    vert += validAttribName;
+    vert +=
+        ";\n"
+        "void main()\n"
+        "{\n"
+        "    gl_Position = vec4(1.0);\n"
+        "}\n";
+
+    std::string frag =
+        "precision highp float;\n"
+        "uniform vec4 ";
+    frag += validUniformName;
+    frag +=
+        ";\n"
+        "void main()\n"
+        "{\n"
+        "    gl_FragColor = vec4(1.0);\n"
+        "}\n";
+
+    ANGLE_GL_PROGRAM(program, vert, frag);
+    EXPECT_GL_NO_ERROR();
+
+    for (char invalidChar : invalidSet)
+    {
+        std::string invalidName = validAttribName + invalidChar;
+        glGetAttribLocation(program, invalidName.c_str());
+        EXPECT_GL_ERROR(GL_INVALID_VALUE)
+            << "glGetAttribLocation unexpectedly succeeded for name \"" << invalidName << "\".";
+
+        glBindAttribLocation(program, 0, invalidName.c_str());
+        EXPECT_GL_ERROR(GL_INVALID_VALUE)
+            << "glBindAttribLocation unexpectedly succeeded for name \"" << invalidName << "\".";
+    }
+
+    for (char invalidChar : invalidSet)
+    {
+        std::string invalidName = validUniformName + invalidChar;
+        glGetUniformLocation(program, invalidName.c_str());
+        EXPECT_GL_ERROR(GL_INVALID_VALUE)
+            << "glGetUniformLocation unexpectedly succeeded for name \"" << invalidName << "\".";
+    }
+
+    for (char invalidChar : invalidSet)
+    {
+        std::string invalidAttribName = validAttribName + invalidChar;
+        const char *invalidVert[] = {
+            "attribute float ",
+            invalidAttribName.c_str(),
+            ";\n",
+            "void main()\n",
+            "{\n",
+            "    gl_Position = vec4(1.0);\n",
+            "}\n",
+        };
+
+        GLuint shader = glCreateShader(GL_VERTEX_SHADER);
+        glShaderSource(shader, static_cast<GLsizei>(ArraySize(invalidVert)), invalidVert, nullptr);
+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
+        glDeleteShader(shader);
+    }
+}
+
 // Test the checks for OOB reads in the vertex buffers, instanced version
 TEST_P(WebGL2CompatibilityTest, DrawArraysBufferOutOfBoundsInstanced)
 {