diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2013-09-06 12:27:11 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2013-09-06 14:51:51 -0700 |
| commit | 0a0f543082ce3bbee3d09425a912a9181128a257 (patch) | |
| tree | eae966107e38567b4336474be5e5bac3dad65c23 /src/mesa/main/queryobj.c | |
| parent | e9f1f6ab42a7c466b3b6cb5460fcf875822c1dbd (diff) | |
| download | external_mesa3d-0a0f543082ce3bbee3d09425a912a9181128a257.zip external_mesa3d-0a0f543082ce3bbee3d09425a912a9181128a257.tar.gz external_mesa3d-0a0f543082ce3bbee3d09425a912a9181128a257.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/queryobj.c')
| -rw-r--r-- | src/mesa/main/queryobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 6b636f4..a180133 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; |