From: Matt Turner <mattst88@gmail.com>
Date: Thu, 23 Jun 2016 06:11:27 +0000 (-0700)
Subject: glx: Fix for commit 2c86668694.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6624174c0aad2df9d551937ddcacd6964160a8fc;p=mesa.git

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.
---

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);