From: Julien Isorce <jisorce@oblong.com>
Date: Thu, 23 Mar 2017 14:25:39 +0000 (+0000)
Subject: r600g: check NULL return from r600_aligned_buffer_create
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ee91af30074a4381e4353122319e3b4b3fe7cbd;p=mesa.git

r600g: check NULL return from r600_aligned_buffer_create

Signed-off-by: Julien Isorce <jisorce@oblong.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 6139bd2f05e..9ca113ac883 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -983,6 +983,11 @@ static void r600_init_color_surface(struct r600_context *rctx,
 							   PIPE_USAGE_DEFAULT,
 							   cmask.size, cmask.alignment);
 
+			if (unlikely(!rctx->dummy_cmask)) {
+				surf->color_initialized = false;
+				return;
+			}
+
 			/* Set the contents to 0xCC. */
 			ptr = pipe_buffer_map(&rctx->b.b, &rctx->dummy_cmask->b.b, PIPE_TRANSFER_WRITE, &transfer);
 			memset(ptr, 0xCC, cmask.size);
@@ -999,6 +1004,11 @@ static void r600_init_color_surface(struct r600_context *rctx,
 				r600_aligned_buffer_create(&rscreen->b.b, 0,
 							   PIPE_USAGE_DEFAULT,
 							   fmask.size, fmask.alignment);
+
+			if (unlikely(!rctx->dummy_fmask)) {
+				surf->color_initialized = false;
+				return;
+			}
 		}
 		r600_resource_reference(&surf->cb_buffer_fmask, rctx->dummy_fmask);