Conor McCarthy : vkd3d-shader/dxil: Do not access null code blocks on failure.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: b30b95e8240e8359fedc85c5eab58e109cde94c3
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/b30b95e8240e8359fedc85c5eab58e...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Thu Sep 14 19:00:00 2023 +1000

vkd3d-shader/dxil: Do not access null code blocks on failure.

---

 libs/vkd3d-shader/dxil.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index e3dcfb79..285c4cfd 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -2522,11 +2522,11 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const
         struct sm6_function *function)
 {
     struct vkd3d_shader_instruction *ins;
+    size_t i, block_idx, block_count;
     const struct dxil_record *record;
     bool ret_found, is_terminator;
     struct sm6_block *code_block;
     struct sm6_value *dst;
-    size_t i, block_idx;
 
     if (sm6->function_count)
     {
@@ -2552,12 +2552,12 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const
         return VKD3D_ERROR_INVALID_SHADER;
     }
 
-    if (!(function->block_count = block->records[0]->operands[0]))
+    if (!(block_count = block->records[0]->operands[0]))
     {
         WARN("Function contains no blocks.\n");
         return VKD3D_ERROR_INVALID_SHADER;
     }
-    if (function->block_count > 1)
+    if (block_count > 1)
     {
         FIXME("Branched shaders are not supported yet.\n");
         return VKD3D_ERROR_INVALID_SHADER;
@@ -2568,6 +2568,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const
         ERR("Failed to allocate code block.\n");
         return VKD3D_ERROR_OUT_OF_MEMORY;
     }
+    function->block_count = block_count;
     code_block = function->blocks[0];
 
     sm6->cur_max_value = function->value_count;