Francisco Casas : vkd3d-shader/hlsl: Introduce hlsl_calloc().

[Alexandre Julliard]

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

Author: Francisco Casas 
Date:   Wed May  3 15:39:58 2023 -0400

vkd3d-shader/hlsl: Introduce hlsl_calloc().

This is just a wrapper of vkd3d_calloc(), that has the advantage of
checking for multiplication overflow.

---

libs/vkd3d-shader/hlsl.c | 6 +++---
 libs/vkd3d-shader/hlsl.h | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index c2911a48..253437a7 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -443,7 +443,7 @@ static bool init_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hl
         return true;
     }

-    if (!(deref->path = hlsl_alloc(ctx, sizeof(*deref->path) * deref->path_len)))
+    if (!(deref->path = hlsl_calloc(ctx, deref->path_len, sizeof(*deref->path))))
     {
         deref->var = NULL;
         deref->path_len = 0;
@@ -882,7 +882,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old,

type->e.record.field_count = field_count;

-            if (!(type->e.record.fields = hlsl_alloc(ctx, field_count * sizeof(*type->e.record.fields))))
+            if (!(type->e.record.fields = hlsl_calloc(ctx, field_count, sizeof(*type->e.record.fields))))
             {
                 vkd3d_free((void *)type->name);
                 vkd3d_free(type);
@@ -974,7 +974,7 @@ struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct
         if (obj_count == 0)
             continue;

-        if (!(var->objects_usage[k] = hlsl_alloc(ctx, sizeof(*var->objects_usage[0]) * obj_count)))
+        if (!(var->objects_usage[k] = hlsl_calloc(ctx, obj_count, sizeof(*var->objects_usage[0]))))
         {
             for (i = 0; i < k; ++i)
                 vkd3d_free(var->objects_usage[i]);
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 2a3b1a58..a3453538 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -939,6 +939,15 @@ static inline void *hlsl_alloc(struct hlsl_ctx *ctx, size_t size)
     return ptr;
 }

+static inline void *hlsl_calloc(struct hlsl_ctx *ctx, size_t count, size_t size)
+{
+    void *ptr = vkd3d_calloc(count, size);
+
+    if (!ptr)
+        ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
+    return ptr;
+}
+
 static inline void *hlsl_realloc(struct hlsl_ctx *ctx, void *ptr, size_t size)
 {
     void *ret = vkd3d_realloc(ptr, size);