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

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

Issue 2380683003: add range check to service-side MapBufferRange (Closed)
Patch Set: rebase over reformat Created 4 years, 3 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
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index b17d868f0c0dfb890696cae84a7baa95f8f4c995..419b6d6853e1d442710914c55f204e30dad863d5 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -16836,12 +16836,21 @@ error::Error GLES2DecoderImpl::HandleMapBufferRange(
(access & GL_MAP_INVALIDATE_RANGE_BIT) == 0) {
access = (access | GL_MAP_READ_BIT);
}
+ Buffer* buffer = buffer_manager()->GetBufferInfoForTarget(&state_, target);
+ if (!buffer) {
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "MapBufferRange",
+ "no buffer bound to target");
+ return error::kNoError;
+ }
+ if (!buffer->CheckRange(offset, size)) {
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "MapBufferRange",
+ "invalid range");
+ return error::kNoError;
+ }
void* ptr = glMapBufferRange(target, offset, size, access);
if (ptr == nullptr) {
return error::kNoError;
}
- Buffer* buffer = buffer_manager()->GetBufferInfoForTarget(&state_, target);
- DCHECK(buffer);
buffer->SetMappedRange(offset, size, access, ptr,
GetSharedMemoryBuffer(data_shm_id));
if ((access & GL_MAP_INVALIDATE_RANGE_BIT) == 0) {
« no previous file with comments | « gpu/command_buffer/service/buffer_manager.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698