Validate vertex element sizes.

Change-Id: I03fabec6a92ef058aa2968418755aca079598cfe Reviewed-on: https://swiftshader-review.googlesource.com/3781Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Validate vertex element sizes.
d62eca33 · Nicolas Capens · 345084ed · d62eca33
Commit d62eca33 authored Aug 04, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 0 deletions

libGLES_CM.cpp src/OpenGL/libGLES_CM/libGLES_CM.cpp +20 -0

No files found.
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@ -680,6 +680,11 @@ void ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer
 {
 	TRACE("(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", size, type, stride, pointer);

+	if(size != 4)
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
 	VertexAttribPointer(sw::Color0, size, type, true, stride, pointer);
 }

@@ -2857,6 +2862,11 @@ void PointSize(GLfloat size)
 {
 	TRACE("(GLfloat size = %f)", size);

+	if(size <= 0)
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
 	es1::Context *context = es1::getContext();

 	if(context)
@@ -3185,6 +3195,11 @@ void TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *poin
 {
 	TRACE("(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", size, type, stride, pointer);

+	if(size < 2 || size > 4)
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
 	es1::Context *context = es1::getContext();

 	if(context)
@@ -4108,6 +4123,11 @@ void VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointe
 {
 	TRACE("(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const GLvoid *pointer = %p)", size, type, stride, pointer);

+	if(size < 2 || size > 4)
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
 	VertexAttribPointer(sw::Position, size, type, false, stride, pointer);
 }