From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Sat, 30 Apr 2016 04:41:59 +0000 (-0500)
Subject: radeonsi: fix undefined behavior (memcpy arguments must be non-NULL)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b9e6e8e7d4ed9f9330aabc73e0644fe50460cf9e;p=mesa.git

radeonsi: fix undefined behavior (memcpy arguments must be non-NULL)

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 52b9851e01e..0bfd7e8d111 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -63,7 +63,9 @@ static void *si_get_tgsi_binary(struct si_shader_selector *sel)
 /** Copy "data" to "ptr" and return the next dword following copied data. */
 static uint32_t *write_data(uint32_t *ptr, const void *data, unsigned size)
 {
-	memcpy(ptr, data, size);
+	/* data may be NULL if size == 0 */
+	if (size)
+		memcpy(ptr, data, size);
 	ptr += DIV_ROUND_UP(size, 4);
 	return ptr;
 }