mesa: Ensure gl_query_object is fully initialized.
authorVinson Lee <vlee@freedesktop.org>
Fri, 6 Sep 2013 19:27:11 +0000 (12:27 -0700)
committerVinson Lee <vlee@freedesktop.org>
Fri, 6 Sep 2013 21:51:51 +0000 (14:51 -0700)
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>
src/mesa/main/queryobj.c

index 6b636f4cb3b04f3daac4c969d6b042abec700f09..a1801336968dd29253236f7c377586672b5c8b3a 100644 (file)
@@ -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;