summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2013-09-09 17:28:35 -0700
committerVinson Lee <[email protected]>2013-09-10 10:54:26 -0700
commitfd66a85f6bd974150e112c0f7275190c1f55bf8f (patch)
tree9fe9e5d772d86d3e14254f6db87d5ec914b55ec8 /src/mesa/main
parent49f2ba2cb07202b93955d15bc2bce2d4ae77bbf9 (diff)
mesa: Ensure gl_sync_object is fully initialized.
278372b47e4db8a022d57f60302eec74819e9341 added the uninitialized pointer field gl_sync_object:Label. A free of this pointer, added in commit 6d8dd59cf53d2f47b817d79204a52bb3a46e8c77, resulted in a crash. This patch fixes piglit ARB_sync regressions with swrast introduced by 6d8dd59cf53d2f47b817d79204a52bb3a46e8c77. Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/syncobj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 92c7cb0e149..987d4f57cbd 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -71,7 +71,7 @@
static struct gl_sync_object *
_mesa_new_sync_object(struct gl_context *ctx, GLenum type)
{
- struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object);
+ struct gl_sync_object *s = CALLOC_STRUCT(gl_sync_object);
(void) ctx;
(void) type;