From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 18 Jan 2017 21:35:19 +0000 (+0100)
Subject: radeonsi: reject invalid vertex element formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e4d1d8a7c0d60a6975d186944cd870e06f94773;p=mesa.git

radeonsi: reject invalid vertex element formats

This should fix a coverity defect.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 876cbf6a34b..4a9ca812174 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3366,6 +3366,11 @@ static void *si_create_vertex_elements(struct pipe_context *ctx,
 
 		desc = util_format_description(elements[i].src_format);
 		first_non_void = util_format_get_first_non_void_channel(elements[i].src_format);
+		if (first_non_void < 0) {
+			FREE(v);
+			return NULL;
+		}
+
 		data_format = si_translate_buffer_dataformat(ctx->screen, desc, first_non_void);
 		num_format = si_translate_buffer_numformat(ctx->screen, desc, first_non_void);
 		channel = &desc->channel[first_non_void];