diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 23:29:35 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-04 23:29:35 +0000 |
| commit | 63cf0e11adcb37bd34a029474ec8d0723687effa (patch) | |
| tree | 8971b5f6bc1fee043fbf0b3b3884faed56298d3a | |
| parent | 437d1311433fb7522c3d895241a5f813337b6f5c (diff) | |
| download | chromium_src-63cf0e11adcb37bd34a029474ec8d0723687effa.zip chromium_src-63cf0e11adcb37bd34a029474ec8d0723687effa.tar.gz chromium_src-63cf0e11adcb37bd34a029474ec8d0723687effa.tar.bz2 | |
Merge 175106
> Fix crash when translated ANGLE shader source has length zero.
>
> BUG=153048
>
> Review URL: https://chromiumcodereview.appspot.com/11770002
TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/11783005
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@175232 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/service/program_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc index ffa2f59..4b8dc7c 100644 --- a/gpu/command_buffer/service/program_manager.cc +++ b/gpu/command_buffer/service/program_manager.cc @@ -472,7 +472,7 @@ void ProgramManager::ForceCompileShader(const std::string* source, info->service_id(), max_len, &len, temp.get()); DCHECK(max_len == 0 || len < max_len); DCHECK(len == 0 || temp[len] == '\0'); - info->UpdateTranslatedSource(temp.get()); + info->UpdateTranslatedSource(max_len ? temp.get() : NULL); } GLint status = GL_FALSE; |