From: Vinson Lee <vlee@freedesktop.org>
Date: Fri, 6 Sep 2013 19:27:11 +0000 (-0700)
Subject: mesa: Ensure gl_query_object is fully initialized.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a0f543082ce3bbee3d09425a912a9181128a257;p=mesa.git

mesa: Ensure gl_query_object is fully initialized.

278372b47e4db8a022d57f60302eec74819e9341 added the uninitialized pointer
field gl_query_object:Label. A free of this pointer resulted in a crash.

This patch fixes piglit regressions with swrast introduced by
6d8dd59cf53d2f47b817d79204a52bb3a46e8c77.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69047
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 6b636f4cb3b..a1801336968 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -43,7 +43,7 @@
 static struct gl_query_object *
 _mesa_new_query_object(struct gl_context *ctx, GLuint id)
 {
-   struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
+   struct gl_query_object *q = CALLOC_STRUCT(gl_query_object);
    (void) ctx;
    if (q) {
       q->Id = id;