From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Mon, 3 Feb 2020 19:32:22 +0000 (-0500)
Subject: pan/midgard: Check for null consts
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f3eb7989b38239d08d729a488ad6b737ec61ad8;p=mesa.git

pan/midgard: Check for null consts

Valid shaders shouldn't hit this, but Coverity doesn't know that.

CID 1458029:    (FORWARD_NULL)
Passing null pointer "consts" to "print_scalar_field", which dereferences it.

Tomeu: Fix name of variable

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3684>
---

diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index 9ef184b8bce..a0640d66e8c 100644
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -337,6 +337,8 @@ print_scalar_constant(FILE *fp, unsigned src_binary,
         midgard_scalar_alu_src *src = (midgard_scalar_alu_src *)&src_binary;
         unsigned mod = 0;
 
+        assert(consts != NULL);
+
         if (!midgard_is_integer_op(alu->op)) {
                 if (src->abs)
                         mod |= MIDGARD_FLOAT_MOD_ABS;