summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2016-06-22 23:11:27 -0700
committerMatt Turner <[email protected]>2016-07-08 16:46:17 -0700
commit6624174c0aad2df9d551937ddcacd6964160a8fc (patch)
treef7d677408fb24b07959a14c3d70a2ebdcee6d75f
parent83a782cd5ed6d0c3265b4bd817160fc4de6a19c1 (diff)
glx: Fix for commit 2c86668694.
Ian suggested these changes in his review and I made them, but I pushed the old version of the patch.
-rw-r--r--src/glx/indirect_vertex_array.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glx/indirect_vertex_array.c b/src/glx/indirect_vertex_array.c
index a7073433a5f..c81aae60386 100644
--- a/src/glx/indirect_vertex_array.c
+++ b/src/glx/indirect_vertex_array.c
@@ -207,6 +207,7 @@ __glXInitVertexArrayState(struct glx_context * gc)
arrays->arrays = calloc(array_count, sizeof(struct array_state));
if (arrays->arrays == NULL) {
+ state->array_state = NULL;
free(arrays);
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
@@ -295,6 +296,7 @@ __glXInitVertexArrayState(struct glx_context * gc)
* __GL_CLIENT_ATTRIB_STACK_DEPTH);
if (arrays->stack == NULL) {
+ state->array_state = NULL;
free(arrays->arrays);
free(arrays);
__glXSetError(gc, GL_OUT_OF_MEMORY);