summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2013-04-17 11:07:49 +1000
committerDave Airlie <[email protected]>2013-04-18 09:50:42 +1000
commit47bd6e46fe89e1cce61b11bcaa7b81f807011c23 (patch)
tree4351274e76f13ee3e60179515aa0b63865531819 /src/glsl
parent815ca0bf38de89cff533a413066a7e23a0aa5fb0 (diff)
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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/ralloc.c2
1 files changed, 2 insertions, 0 deletions
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;