fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glx: check memory allocations in __glXInitVertexArrayState()

Browse source 
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Juha-Pekka Heikkila 2014-01-03 05:57:00 -07:00 • committed by Brian Paul
parent 0c04cca0e1
commit d41f5396f3
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/glx/indirect_vertex_array.c
View file

@ -135,9 +135,6 @@ __glXFreeVertexArrayState(struct glx_context * gc)
* struct glx_context::server_minor, and __GLXcontext::server_major have been
* initialized. These values are used to determine what vertex arrays are
* supported.
*
* \bug
* Return values from malloc are not properly tested.
*/
void
__glXInitVertexArrayState(struct glx_context * gc)
@ -154,7 +151,11 @@ __glXInitVertexArrayState(struct glx_context * gc)
arrays = calloc(1, sizeof(struct array_state_vector));
state->array_state = arrays;
if (arrays == NULL) {
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
}
arrays->old_DrawArrays_possible = !state->NoDrawArraysProtocol;
arrays->new_DrawArrays_possible = GL_FALSE;
@ -204,6 +205,12 @@ __glXInitVertexArrayState(struct glx_context * gc)
arrays->num_arrays = array_count;
arrays->arrays = calloc(array_count, sizeof(struct array_state));
if (arrays->arrays == NULL) {
free(arrays);
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
}
arrays->arrays[0].data_type = GL_FLOAT;
arrays->arrays[0].count = 3;
arrays->arrays[0].key = GL_NORMAL_ARRAY;
@ -289,6 +296,18 @@ __glXInitVertexArrayState(struct glx_context * gc)
arrays->stack = malloc(sizeof(struct array_stack_state)
* arrays->num_arrays
* __GL_CLIENT_ATTRIB_STACK_DEPTH);
if (arrays->stack == NULL) {
free(arrays->arrays);
free(arrays);
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
}
/* Everything went ok so we put vertex array state in place
* in context.
*/
state->array_state = arrays;
}