Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc

Issue 2688233002: Add null checks to the parameters of glGet* calls. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc
index 221a968daccbeafef16e8bd6918df7e06edb6994..f6e26a305c1fc7d90ce68d98eef646617e760417 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc
@@ -228,6 +228,9 @@ error::Error GLES2DecoderPassthroughImpl::HandleGetActiveUniformBlockiv(
Result* result = GetSharedMemoryAndSizeAs<Result*>(
c.params_shm_id, c.params_shm_offset, &buffer_size);
GLint* params = result ? result->GetData() : NULL;
+ if (params == NULL) {
+ return error::kOutOfBounds;
+ }
GLsizei bufsize = Result::ComputeMaxResults(buffer_size);
GLsizei length = 0;
error::Error error = DoGetActiveUniformBlockiv(
@@ -445,6 +448,9 @@ error::Error GLES2DecoderPassthroughImpl::HandleGetInternalformativ(
Result* result = GetSharedMemoryAndSizeAs<Result*>(
c.params_shm_id, c.params_shm_offset, &buffer_size);
GLint* params = result ? result->GetData() : NULL;
+ if (params == NULL) {
+ return error::kOutOfBounds;
+ }
GLsizei bufsize = Result::ComputeMaxResults(buffer_size);
GLsizei length = 0;
error::Error error = DoGetInternalformativ(target, internalformat, pname,
@@ -651,6 +657,9 @@ error::Error GLES2DecoderPassthroughImpl::HandleGetUniformfv(
Result* result = GetSharedMemoryAndSizeAs<Result*>(
c.params_shm_id, c.params_shm_offset, &buffer_size);
GLfloat* params = result ? result->GetData() : NULL;
+ if (params == NULL) {
+ return error::kOutOfBounds;
+ }
GLsizei bufsize = Result::ComputeMaxResults(buffer_size);
GLsizei length = 0;
error::Error error =
@@ -677,6 +686,9 @@ error::Error GLES2DecoderPassthroughImpl::HandleGetUniformiv(
Result* result = GetSharedMemoryAndSizeAs<Result*>(
c.params_shm_id, c.params_shm_offset, &buffer_size);
GLint* params = result ? result->GetData() : NULL;
+ if (params == NULL) {
+ return error::kOutOfBounds;
+ }
GLsizei bufsize = Result::ComputeMaxResults(buffer_size);
GLsizei length = 0;
error::Error error =
@@ -703,6 +715,9 @@ error::Error GLES2DecoderPassthroughImpl::HandleGetUniformuiv(
Result* result = GetSharedMemoryAndSizeAs<Result*>(
c.params_shm_id, c.params_shm_offset, &buffer_size);
GLuint* params = result ? result->GetData() : NULL;
+ if (params == NULL) {
+ return error::kOutOfBounds;
+ }
GLsizei bufsize = Result::ComputeMaxResults(buffer_size);
GLsizei length = 0;
error::Error error =
@@ -801,6 +816,9 @@ error::Error GLES2DecoderPassthroughImpl::HandleGetVertexAttribPointerv(
Result* result = GetSharedMemoryAndSizeAs<Result*>(
c.pointer_shm_id, c.pointer_shm_offset, &buffer_size);
GLuint* params = result ? result->GetData() : NULL;
+ if (params == NULL) {
+ return error::kOutOfBounds;
+ }
GLsizei bufsize = Result::ComputeMaxResults(buffer_size);
GLsizei length = 0;
error::Error error =
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698