Mesa (master): anv: null check for buffer before reading size

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 709dffa856682b706e516dd324e2f5129a127e8e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=709dffa856682b706e516dd324e2f5129a127e8e

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Aug 18 15:16:37 2020 +0300

anv: null check for buffer before reading size

v2: move assignment under existing check (Nanley)

Fixes: b9a05447a19 ("anv: dynamic vertex input binding stride and size support")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6369>

---

 src/intel/vulkan/genX_cmd_buffer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 7afaeca366b..4522f5d2aef 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -3344,13 +3344,13 @@ genX(cmd_buffer_flush_state)(struct anv_cmd_buffer *cmd_buffer)
          bool dynamic_stride = cmd_buffer->state.gfx.dynamic.dyn_vbo_stride;
          bool dynamic_size = cmd_buffer->state.gfx.dynamic.dyn_vbo_size;
 
-         uint32_t stride = dynamic_stride ?
-            cmd_buffer->state.vertex_bindings[vb].stride : pipeline->vb[vb].stride;
-         uint32_t size = dynamic_size ?
-            cmd_buffer->state.vertex_bindings[vb].size : buffer->size;
-
          struct GENX(VERTEX_BUFFER_STATE) state;
          if (buffer) {
+            uint32_t stride = dynamic_stride ?
+               cmd_buffer->state.vertex_bindings[vb].stride : pipeline->vb[vb].stride;
+            uint32_t size = dynamic_size ?
+               cmd_buffer->state.vertex_bindings[vb].size : buffer->size;
+
             state = (struct GENX(VERTEX_BUFFER_STATE)) {
                .VertexBufferIndex = vb,