glGetProgramiv was returning incorrect values for GL_ACTIVE_UNIFORM_MAX_LENGT...

gpu/command_buffer/service/program_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/program_manager.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ skipping 195 matching lines @@
   }
   return false;
 }
 
 void ProgramManager::ProgramInfo::GetProgramiv(GLenum pname, GLint* params) {
   switch (pname) {
     case GL_ACTIVE_ATTRIBUTES:
       *params = attrib_infos_.size();
       break;
     case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
-      *params = max_attrib_name_length_;
+      // Notice +1 to accomodate NULL terminator.
+      *params = max_attrib_name_length_ + 1;
       break;
     case GL_ACTIVE_UNIFORMS:
       *params = uniform_infos_.size();
       break;
     case GL_ACTIVE_UNIFORM_MAX_LENGTH:
-      *params = max_uniform_name_length_;
+      // Notice +1 to accomodate NULL terminator.
+      *params = max_uniform_name_length_ + 1;
       break;
     default:
       glGetProgramiv(program_id_, pname, params);
       break;
   }
 }
 
 void ProgramManager::CreateProgramInfo(GLuint program_id) {
   std::pair<ProgramInfoMap::iterator, bool> result =
       program_infos_.insert(
@@ skipping 12 matching lines @@
   if (it != program_infos_.end()) {
     it->second->MarkAsDeleted();
     program_infos_.erase(it);
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu