diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 00:44:29 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 00:44:29 +0000 |
| commit | ddd968b875f51efee01401fd307f4c691dfd6a9a (patch) | |
| tree | f9df8a06531e546b717a8fa328597e787198b142 /gpu/command_buffer/service/common_decoder.cc | |
| parent | 516fc39eeea5658b9aeeda0094d5817edd5ec235 (diff) | |
| download | chromium_src-ddd968b875f51efee01401fd307f4c691dfd6a9a.zip chromium_src-ddd968b875f51efee01401fd307f4c691dfd6a9a.tar.gz chromium_src-ddd968b875f51efee01401fd307f4c691dfd6a9a.tar.bz2 | |
Attempt to submit this CL for the 3rd time. No changes.
http://src.chromium.org/viewvc/chrome?view=rev&revision=40212
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/661309
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/common_decoder.cc')
| -rw-r--r-- | gpu/command_buffer/service/common_decoder.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/common_decoder.cc b/gpu/command_buffer/service/common_decoder.cc index 4452e39..06d368d 100644 --- a/gpu/command_buffer/service/common_decoder.cc +++ b/gpu/command_buffer/service/common_decoder.cc @@ -8,7 +8,7 @@ namespace gpu { -const void* CommonDecoder::Bucket::GetData(size_t offset, size_t size) const { +void* CommonDecoder::Bucket::GetData(size_t offset, size_t size) const { if (OffsetSizeValid(offset, size)) { return data_.get() + offset; } @@ -33,8 +33,10 @@ bool CommonDecoder::Bucket::SetData( } void CommonDecoder::Bucket::SetFromString(const std::string& str) { - SetSize(str.size()); - SetData(str.c_str(), 0, str.size()); + // Strings are passed NULL terminated to distinguish between empty string + // and no string. + SetSize(str.size() + 1); + SetData(str.c_str(), 0, str.size() + 1); } void* CommonDecoder::GetAddressAndCheckSize(unsigned int shm_id, |