radeonsi: check if value is negative

Fixes a Coverity defect by adding checks to see if a value is negative
before using it to index an array. By checking the value first it makes
the code a bit safer but overall should not have a big impact.

CID: 1355598

Signed-off-by: Jakob Sinclair <sinclair.jakob@openmailbox.org>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 06798f2ac600aef5c7d8ee9001efa8a5e5821107..c214932e28b9da3b0673b91bf6220aab6e7d0ea8 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1762,6 +1762,9 @@ static uint32_t si_translate_buffer_dataformat(struct pipe_screen *screen,
                                               const struct util_format_description *desc,
                                               int first_non_void)
 {
+       if (first_non_void < 0)
+               return V_008F0C_BUF_DATA_FORMAT_INVALID;
+
        unsigned type = desc->channel[first_non_void].type;
        int i;
 
@@ -1836,7 +1839,7 @@ static uint32_t si_translate_buffer_numformat(struct pipe_screen *screen,
                                              const struct util_format_description *desc,
                                              int first_non_void)
 {
-       if (desc->format == PIPE_FORMAT_R11G11B10_FLOAT)
+       if (desc->format == PIPE_FORMAT_R11G11B10_FLOAT || first_non_void < 0)
                return V_008F0C_BUF_NUM_FORMAT_FLOAT;
 
        switch (desc->channel[first_non_void].type) {