From 47bd6e46fe89e1cce61b11bcaa7b81f807011c23 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 17 Apr 2013 11:07:49 +1000 Subject: [PATCH] ralloc: don't write to memory in case of alloc fail. For some reason I made this happen under indirect rendering, I think we might have a leak, valgrind gave out, so I said I'd fix the basic problem. NOTE: This is a candidate for stable branches. Reviewed-by: Ian Romanick Reviewed-by: Kenneth Graunke Signed-off-by: Dave Airlie --- src/glsl/ralloc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glsl/ralloc.c b/src/glsl/ralloc.c index 59e71c48b00..02816425221 100644 --- a/src/glsl/ralloc.c +++ b/src/glsl/ralloc.c @@ -108,6 +108,8 @@ ralloc_size(const void *ctx, size_t size) { void *block = calloc(1, size + sizeof(ralloc_header)); + if (unlikely(block == NULL)) + return NULL; ralloc_header *info = (ralloc_header *) block; ralloc_header *parent = ctx != NULL ? get_header(ctx) : NULL; -- 2.30.2