[PATCH vkd3d 04/12] programs/vkd3d-compiler: Do not overallocate memory for shader code.

[Józef Kucia]

From: Józef Kucia <jkucia(a)codeweavers.com>

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
---
 libs/vkd3d-shader/spirv.c      | 2 +-
 programs/vkd3d-compiler/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index a5dae19ef7cb..d7c80163c677 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2509,7 +2509,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile
         const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask)
 {
     unsigned int component_count = vkd3d_write_mask_component_count(write_mask);
-    uint32_t values[VKD3D_VEC4_SIZE];
+    uint32_t values[VKD3D_VEC4_SIZE] = {0};
     unsigned int i, j;
 
     assert(reg->type == VKD3DSPR_IMMCONST);
diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index 83ccd3d65a4a..5fe4540ca17c 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -46,7 +46,7 @@ static bool read_shader(struct vkd3d_shader_code *shader, const char *filename)
         return false;
     }
 
-    if (!(code = malloc(sizeof(uint32_t) * shader->size)))
+    if (!(code = malloc(shader->size)))
     {
         fprintf(stderr, "Out of memory.\n");
         fclose(fd);
-- 
2.16.4

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=40702

Your paranoid android.


=== debian9 (build) ===
Task: Patch failed to apply

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>