Zebediah Figura : vkd3d-shader: Centralize cleanup on error in scan_with_parser().

[Alexandre Julliard]

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

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Mon Jul 31 18:36:30 2023 -0500

vkd3d-shader: Centralize cleanup on error in scan_with_parser().

---

 libs/vkd3d-shader/vkd3d_shader_main.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 4d45e1e2..569409cc 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1132,11 +1132,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
     {
         instruction = &parser->instructions.elements[i];
         if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0)
-        {
-            if (scan_descriptor_info)
-                vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info);
             break;
-        }
     }
 
     for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i)
@@ -1156,13 +1152,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
                 || !vkd3d_shader_signature_from_shader_signature(&signature_info->patch_constant,
                         &parser->shader_desc.patch_constant_signature))
         {
-            vkd3d_shader_free_scan_signature_info(signature_info);
-            if (scan_descriptor_info)
-                vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info);
             ret = VKD3D_ERROR_OUT_OF_MEMORY;
         }
     }
 
+    if (ret < 0)
+    {
+        if (scan_descriptor_info)
+            vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info);
+        if (signature_info)
+            vkd3d_shader_free_scan_signature_info(signature_info);
+    }
     vkd3d_shader_scan_context_cleanup(&context);
     return ret;
 }