diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-19 17:32:05 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-11-19 17:32:05 -0800 |
| commit | 39f0003e3ad0a9d9eb144d9e826f194d3533319a (patch) | |
| tree | e0c60ae2a2bae84c5ca9162a64910c1b82196cd7 /opengl | |
| parent | 74a331b5dd1d39da44b608743c36ab3523f598d2 (diff) | |
| download | frameworks_base-39f0003e3ad0a9d9eb144d9e826f194d3533319a.zip frameworks_base-39f0003e3ad0a9d9eb144d9e826f194d3533319a.tar.gz frameworks_base-39f0003e3ad0a9d9eb144d9e826f194d3533319a.tar.bz2 | |
fix [2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/array.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/opengl/libagl/array.cpp b/opengl/libagl/array.cpp index 4878722..71825c5 100644 --- a/opengl/libagl/array.cpp +++ b/opengl/libagl/array.cpp @@ -1548,24 +1548,36 @@ void glDeleteBuffers(GLsizei n, const GLuint* buffers) GLuint name = buffers[i]; if (name) { // unbind bound deleted buffers... - if (c->arrays.element_array_buffer->name == name) { - c->arrays.element_array_buffer = 0; + if (c->arrays.element_array_buffer) { + if (c->arrays.element_array_buffer->name == name) { + c->arrays.element_array_buffer = 0; + } } - if (c->arrays.array_buffer->name == name) { - c->arrays.array_buffer = 0; + if (c->arrays.array_buffer) { + if (c->arrays.array_buffer->name == name) { + c->arrays.array_buffer = 0; + } } - if (c->arrays.vertex.bo->name == name) { - c->arrays.vertex.bo = 0; + if (c->arrays.vertex.bo) { + if (c->arrays.vertex.bo->name == name) { + c->arrays.vertex.bo = 0; + } } - if (c->arrays.normal.bo->name == name) { - c->arrays.normal.bo = 0; + if (c->arrays.normal.bo) { + if (c->arrays.normal.bo->name == name) { + c->arrays.normal.bo = 0; + } } - if (c->arrays.color.bo->name == name) { - c->arrays.color.bo = 0; + if (c->arrays.color.bo) { + if (c->arrays.color.bo->name == name) { + c->arrays.color.bo = 0; + } } for (int t=0 ; t<GGL_TEXTURE_UNIT_COUNT ; t++) { - if (c->arrays.texture[t].bo->name == name) { - c->arrays.texture[t].bo = 0; + if (c->arrays.texture[t].bo) { + if (c->arrays.texture[t].bo->name == name) { + c->arrays.texture[t].bo = 0; + } } } } |