From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Sat, 23 Apr 2016 02:57:51 +0000 (-0500)
Subject: radeonsi: correct NULL-pointer check in si_upload_const_buffer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=169ace5636defc032ed2a835b5ea7c55631b930f;p=mesa.git

radeonsi: correct NULL-pointer check in si_upload_const_buffer

Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 27f2a7412e6..b48160555f0 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -783,7 +783,7 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf
 
 	u_upload_alloc(sctx->b.uploader, 0, size, 256, const_offset,
 		       (struct pipe_resource**)rbuffer, &tmp);
-	if (rbuffer)
+	if (*rbuffer)
 		util_memcpy_cpu_to_le32(tmp, ptr, size);
 }