Module: Mesa
Branch: master
Commit: 47bd6e46fe89e1cce61b11bcaa7b81f807011c23
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=47bd6e46fe89e1cce61b11bcaa7b81f807011c23

Author: Dave Airlie <[email protected]>
Date:   Wed Apr 17 11:07:49 2013 +1000

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]>

---

 src/glsl/ralloc.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glsl/ralloc.c b/src/glsl/ralloc.c
index 59e71c4..0281642 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;
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to