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

Side by Side Diff: gpu/command_buffer/service/common_decoder.cc

Issue 2764403002: Make sure buffers are large enough to hold the Result structure. (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/common_decoder.h" 5 #include "gpu/command_buffer/service/common_decoder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 unsigned int data_size) { 136 unsigned int data_size) {
137 CHECK(engine_); 137 CHECK(engine_);
138 scoped_refptr<gpu::Buffer> buffer = engine_->GetSharedMemoryBuffer(shm_id); 138 scoped_refptr<gpu::Buffer> buffer = engine_->GetSharedMemoryBuffer(shm_id);
139 if (!buffer.get()) 139 if (!buffer.get())
140 return NULL; 140 return NULL;
141 return buffer->GetDataAddress(data_offset, data_size); 141 return buffer->GetDataAddress(data_offset, data_size);
142 } 142 }
143 143
144 void* CommonDecoder::GetAddressAndSize(unsigned int shm_id, 144 void* CommonDecoder::GetAddressAndSize(unsigned int shm_id,
145 unsigned int data_offset, 145 unsigned int data_offset,
146 unsigned int minimum_size,
146 unsigned int* data_size) { 147 unsigned int* data_size) {
147 CHECK(engine_); 148 CHECK(engine_);
148 scoped_refptr<gpu::Buffer> buffer = engine_->GetSharedMemoryBuffer(shm_id); 149 scoped_refptr<gpu::Buffer> buffer = engine_->GetSharedMemoryBuffer(shm_id);
149 if (!buffer.get()) 150 if (!buffer.get() || buffer->GetRemainingSize(data_offset) < minimum_size)
150 return NULL; 151 return NULL;
151 return buffer->GetDataAddressAndSize(data_offset, data_size); 152 return buffer->GetDataAddressAndSize(data_offset, data_size);
152 } 153 }
153 154
154 unsigned int CommonDecoder::GetSharedMemorySize(unsigned int shm_id, 155 unsigned int CommonDecoder::GetSharedMemorySize(unsigned int shm_id,
155 unsigned int offset) { 156 unsigned int offset) {
156 CHECK(engine_); 157 CHECK(engine_);
157 scoped_refptr<gpu::Buffer> buffer = engine_->GetSharedMemoryBuffer(shm_id); 158 scoped_refptr<gpu::Buffer> buffer = engine_->GetSharedMemoryBuffer(shm_id);
158 if (!buffer.get()) 159 if (!buffer.get())
159 return 0; 160 return 0;
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 } 353 }
353 const void* src = bucket->GetData(offset, size); 354 const void* src = bucket->GetData(offset, size);
354 if (!src) { 355 if (!src) {
355 return error::kInvalidArguments; 356 return error::kInvalidArguments;
356 } 357 }
357 memcpy(data, src, size); 358 memcpy(data, src, size);
358 return error::kNoError; 359 return error::kNoError;
359 } 360 }
360 361
361 } // namespace gpu 362 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/common_decoder.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698