Added proper size/offset checks

glTexSubImage3D and glCopyTexSubImage3D were missing some validity checks for size and offset parameters. Change-Id: Iff1aa034318c1fc58f9bb433c61bd8623493604a Reviewed-on: https://swiftshader-review.googlesource.com/3602Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Added proper size/offset checks
be381599 · Alexis Hetu · Alexis Hétu · 895a1e72 · be381599
Commit be381599 authored Jun 30, 2015 by Alexis Hetu Committed by Alexis Hétu Jun 30, 2015
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +6 -1

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -642,7 +642,7 @@ GL_APICALL void GL_APIENTRY glTexSubImage3D(GLenum target, GLint level, GLint xo
 		return error(GL_INVALID_VALUE);
 	}

-	if((width < 0) || (height < 0) || (depth < 0))
+	if((width < 0) || (height < 0) || (depth < 0) || (xoffset < 0) || (yoffset < 0) || (zoffset < 0))
 	{
 		return error(GL_INVALID_VALUE);
 	}
@@ -680,6 +680,11 @@ GL_APICALL void GL_APIENTRY glCopyTexSubImage3D(GLenum target, GLint level, GLin
 		return error(GL_INVALID_VALUE);
 	}

+	if((width < 0) || (height < 0) || (xoffset < 0) || (yoffset < 0) || (zoffset < 0))
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
 	es2::Context *context = es2::getContext();

 	if(context)