Nikolay Sivov : vkd3d-compiler: Dynamically allocate options array.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Mon Oct 16 18:50:03 2023 +0200

vkd3d-compiler: Dynamically allocate options array.

Signed-off-by: Nikolay Sivov

---

programs/vkd3d-compiler/main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index fbc81078..2e5f2b97 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -35,8 +35,6 @@
 #include <term.h>
 #endif

-#define MAX_COMPILE_OPTIONS 6
-
 enum
 {
     OPTION_HELP = CHAR_MAX + 1,
@@ -233,7 +231,7 @@ struct options
     uint32_t formatting;
     bool explicit_colour;

-    struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS];
+    struct vkd3d_shader_compile_option *compile_options;
     unsigned int compile_option_count;
 };

@@ -242,6 +240,7 @@ static void add_compile_option(struct options *options,
 {
     struct vkd3d_shader_compile_option *o;
     unsigned int i;
+    size_t size;

for (i = 0; i < options->compile_option_count; ++i)
     {
@@ -254,9 +253,10 @@ static void add_compile_option(struct options *options,
         }
     }

-    if (options->compile_option_count >= ARRAY_SIZE(options->compile_options))
+    size = (options->compile_option_count + 1) * sizeof(*o);
+    if (!(options->compile_options = realloc(options->compile_options, size)))
     {
-        fprintf(stderr, "Ignoring option.\n");
+        fprintf(stderr, "Out of memory.\n");
         return;
     }