"/b/slave/chromium-rel-linux/build/src/gpu/command_buffer/client/gles2_demo_c...

gpu/command_buffer/service/common_decoder.cc

Index: gpu/command_buffer/service/common_decoder.cc
===================================================================
--- gpu/command_buffer/service/common_decoder.cc	(revision 40197)
+++ gpu/command_buffer/service/common_decoder.cc	(working copy)
@@ -8,7 +8,7 @@
 
 namespace gpu {
 
-void* CommonDecoder::Bucket::GetData(size_t offset, size_t size) const {
+const void* CommonDecoder::Bucket::GetData(size_t offset, size_t size) const {
   if (OffsetSizeValid(offset, size)) {
     return data_.get() + offset;
   }
@@ -33,10 +33,8 @@
 }
 
 void CommonDecoder::Bucket::SetFromString(const std::string& str) {
-  // 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);
+  SetSize(str.size());
+  SetData(str.c_str(), 0, str.size());
 }
 
 void* CommonDecoder::GetAddressAndCheckSize(unsigned int shm_id,