Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h |
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h |
index 720d54e339e7877895f31dc4468acf6adb41c53f..49fa8721e6c401fb6258c8fca37b3e63b783b627 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h |
@@ -2432,48 +2432,21 @@ error::Error GLES2DecoderImpl::HandleShaderSourceBucket( |
(void)c; |
GLuint shader = static_cast<GLuint>(c.shader); |
- const size_t kMinBucketSize = sizeof(GLint); |
- // Each string has at least |length| in the header and a NUL character. |
- const size_t kMinStringSize = sizeof(GLint) + 1; |
Bucket* bucket = GetBucket(c.str_bucket_id); |
if (!bucket) { |
return error::kInvalidArguments; |
} |
- const size_t bucket_size = bucket->size(); |
- if (bucket_size < kMinBucketSize) { |
- return error::kInvalidArguments; |
- } |
- const char* bucket_data = bucket->GetDataAs<const char*>(0, bucket_size); |
- const GLint* header = reinterpret_cast<const GLint*>(bucket_data); |
- GLsizei count = static_cast<GLsizei>(header[0]); |
- if (count < 0) { |
- return error::kInvalidArguments; |
- } |
- const size_t max_count = (bucket_size - kMinBucketSize) / kMinStringSize; |
- if (max_count < static_cast<size_t>(count)) { |
- return error::kInvalidArguments; |
- } |
- const GLint* length = header + 1; |
- scoped_ptr<const char* []> strs; |
- if (count > 0) |
- strs.reset(new const char* [count]); |
- const char** str = strs.get(); |
- base::CheckedNumeric<size_t> total_size = sizeof(GLint); |
- total_size *= count + 1; // Header size. |
- if (!total_size.IsValid()) |
- return error::kInvalidArguments; |
- for (GLsizei ii = 0; ii < count; ++ii) { |
- str[ii] = bucket_data + total_size.ValueOrDefault(0); |
- total_size += length[ii]; |
- total_size += 1; // NUL char at the end of each char array. |
- if (!total_size.IsValid() || total_size.ValueOrDefault(0) > bucket_size || |
- str[ii][length[ii]] != 0) { |
- return error::kInvalidArguments; |
- } |
- } |
- if (total_size.ValueOrDefault(0) != bucket_size) { |
+ GLsizei count = 0; |
+ std::vector<char*> strs; |
+ std::vector<GLint> len; |
+ if (!bucket->GetAsStrings(&count, &strs, &len)) { |
return error::kInvalidArguments; |
} |
+ const char** str = |
+ strs.size() > 0 ? const_cast<const char**>(&strs[0]) : NULL; |
+ const GLint* length = |
+ len.size() > 0 ? const_cast<const GLint*>(&len[0]) : NULL; |
+ (void)length; |
DoShaderSource(shader, count, str, length); |
return error::kNoError; |
} |
@@ -2817,48 +2790,21 @@ error::Error GLES2DecoderImpl::HandleTransformFeedbackVaryingsBucket( |
(void)c; |
GLuint program = static_cast<GLuint>(c.program); |
- const size_t kMinBucketSize = sizeof(GLint); |
- // Each string has at least |length| in the header and a NUL character. |
- const size_t kMinStringSize = sizeof(GLint) + 1; |
Bucket* bucket = GetBucket(c.varyings_bucket_id); |
if (!bucket) { |
return error::kInvalidArguments; |
} |
- const size_t bucket_size = bucket->size(); |
- if (bucket_size < kMinBucketSize) { |
- return error::kInvalidArguments; |
- } |
- const char* bucket_data = bucket->GetDataAs<const char*>(0, bucket_size); |
- const GLint* header = reinterpret_cast<const GLint*>(bucket_data); |
- GLsizei count = static_cast<GLsizei>(header[0]); |
- if (count < 0) { |
- return error::kInvalidArguments; |
- } |
- const size_t max_count = (bucket_size - kMinBucketSize) / kMinStringSize; |
- if (max_count < static_cast<size_t>(count)) { |
- return error::kInvalidArguments; |
- } |
- const GLint* length = header + 1; |
- scoped_ptr<const char* []> strs; |
- if (count > 0) |
- strs.reset(new const char* [count]); |
- const char** varyings = strs.get(); |
- base::CheckedNumeric<size_t> total_size = sizeof(GLint); |
- total_size *= count + 1; // Header size. |
- if (!total_size.IsValid()) |
- return error::kInvalidArguments; |
- for (GLsizei ii = 0; ii < count; ++ii) { |
- varyings[ii] = bucket_data + total_size.ValueOrDefault(0); |
- total_size += length[ii]; |
- total_size += 1; // NUL char at the end of each char array. |
- if (!total_size.IsValid() || total_size.ValueOrDefault(0) > bucket_size || |
- varyings[ii][length[ii]] != 0) { |
- return error::kInvalidArguments; |
- } |
- } |
- if (total_size.ValueOrDefault(0) != bucket_size) { |
+ GLsizei count = 0; |
+ std::vector<char*> strs; |
+ std::vector<GLint> len; |
+ if (!bucket->GetAsStrings(&count, &strs, &len)) { |
return error::kInvalidArguments; |
} |
+ const char** varyings = |
+ strs.size() > 0 ? const_cast<const char**>(&strs[0]) : NULL; |
+ const GLint* length = |
+ len.size() > 0 ? const_cast<const GLint*>(&len[0]) : NULL; |
+ (void)length; |
GLenum buffermode = static_cast<GLenum>(c.buffermode); |
DoTransformFeedbackVaryings(program, count, varyings, buffermode); |
return error::kNoError; |