diff options
| author | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 17:36:39 +0000 |
|---|---|---|
| committer | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 17:36:39 +0000 |
| commit | 0c8c9d2e5bd3d153a5794238c6d5398cd4298331 (patch) | |
| tree | 1abf6498d751f619e7dce488f211498875e828f5 /chrome/renderer | |
| parent | fbf3da1409dead368edeec9681cf0015f664eaa3 (diff) | |
| download | chromium_src-0c8c9d2e5bd3d153a5794238c6d5398cd4298331.zip chromium_src-0c8c9d2e5bd3d153a5794238c6d5398cd4298331.tar.gz chromium_src-0c8c9d2e5bd3d153a5794238c6d5398cd4298331.tar.bz2 | |
Fix two webgl crashes.
Uninitialized variable in getProgramInfoLog and friends.
Fix crash in GLES2DecoderImpl if resizing the <canvas> when parent_ is null.
BUG=44590
TEST=64-bit chrome on Linux is able to run the o3d-webgl samples.
Review URL: http://codereview.chromium.org/2819025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc index c691b46..c08ba7c 100644 --- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -484,7 +484,7 @@ DELEGATE_TO_GL_3(getProgramiv, GetProgramiv, WebGLId, unsigned long, int*) WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog( WebGLId program) { makeContextCurrent(); - GLint logLength; + GLint logLength = 0; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength); if (!logLength) return WebKit::WebString(); @@ -507,7 +507,7 @@ DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, unsigned long, int*) WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog( WebGLId shader) { makeContextCurrent(); - GLint logLength; + GLint logLength = 0; glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength); if (!logLength) return WebKit::WebString(); @@ -525,7 +525,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog( WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource( WebGLId shader) { makeContextCurrent(); - GLint logLength; + GLint logLength = 0; glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength); if (!logLength) return WebKit::WebString(); |