Replace uses of variable-length arrays with try_malloc()/free().

[plomrogue] / src / server / run.c

diff --git a/src/server/run.c b/src/server/run.c
index ec018c594e1fbd5659863f84fa0171c04070e503..9ab9f30b08f0c9dd71eb245b7a600f7f61f51fc1 100644 (file)
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -16,6 +16,7 @@
                                   * textfile_width(), try_fputc()
                                   */
 #include "../common/rexit.h" /* exit_trouble(), exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
 #include "ai.h" /* ai() */
 #include "cleanup.h" /* set_cleanup_flag(), unset_cleanup_flag() */
 #include "field_of_view.h" /* build_fov_map() */
@@ -121,7 +122,7 @@ static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t)
                 t->pos.x = length;
             }
             free(t->fov_map);
-            t->fov_map = do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
+            t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
         }
         return 1;
     }
@@ -196,10 +197,10 @@ static uint8_t parse_thing_manipulation(char * tok0, char * tok1)
     static struct Thing * t = NULL;
     if (t && (   parse_thing_type(tok0, tok1, t)
               || parse_thing_command(tok0, tok1, t)
-              || parse_val(tok0, tok1, s[CMD_ARGUMENT], '8', (char *) &t->arg)
-              || parse_val(tok0, tok1, s[CMD_PROGRESS], '8', (char *) &t->progress)
-
-              || parse_val(tok0, tok1, s[CMD_LIFEPOINTS],'8',(char *) &t->lifepoints)
+              || parse_val(tok0, tok1, s[CMD_ARGUMENT], '8', (char *)&t->arg)
+              || parse_val(tok0, tok1, s[CMD_PROGRESS],'8',(char *)&t->progress)
+              || parse_val(tok0, tok1, s[CMD_LIFEPOINTS],'8',
+                                                        (char *) &t->lifepoints)
               || parse_position(tok0, tok1, t)
               || parse_carry(tok0, tok1, t)));
     else if (parse_val(tok0, tok1, s[CMD_THING], '8', (char *) &id))
@@ -209,7 +210,7 @@ static uint8_t parse_thing_manipulation(char * tok0, char * tok1)
         {
             t = add_thing(id, 0, 0);
             set_cleanup_flag(CLEANUP_THINGS);
-            t->fov_map = do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
+            t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map;
         }
     }
     else
@@ -308,23 +309,26 @@ static void turn_over()
 static void record_msg(char * msg)
 {
     char * f_name = "record_msg()";
-    char path_tmp[strlen(s[PATH_RECORD]) + strlen(s[PATH_SUFFIX_TMP]) + 1];
+    uint16_t size = strlen(s[PATH_RECORD]) + strlen(s[PATH_SUFFIX_TMP]) + 1;
+    char * path_tmp = try_malloc(size, f_name);
     sprintf(path_tmp, "%s%s", s[PATH_RECORD], s[PATH_SUFFIX_TMP]);
     FILE * file_tmp  = try_fopen(path_tmp, "w", f_name);
     if (!access(s[PATH_RECORD], F_OK))
     {
         FILE * file_read = try_fopen(s[PATH_RECORD], "r", f_name);
         uint32_t linemax = textfile_width(file_read);
-        char line[linemax + 1];
+        char * line = try_malloc(linemax + 1, f_name);
         while (try_fgets(line, linemax + 1, file_read, f_name))
         {
             try_fwrite(line, strlen(line), 1, file_tmp, f_name);
         }
+        free(line);
         try_fclose(file_read, f_name);
     }
     try_fwrite(msg, strlen(msg), 1, file_tmp, f_name);
     try_fputc('\n', file_tmp, f_name);
     try_fclose_unlink_rename(file_tmp, path_tmp, s[PATH_RECORD], f_name);
+    free(path_tmp);
 }
 
 
@@ -345,12 +349,12 @@ extern void obey_msg(char * msg, uint8_t do_record)
         || parse_val(tok0, tok1, s[CMD_SEED_RAND], 'U', (char *) &world.seed)
         || parse_val(tok0, tok1, s[CMD_TURN], 'u', (char *) &world.turn)
         || parse_do_fov(tok0, tok1));
-    else if (parse_val(tok0, tok1, s[CMD_SEED_MAP], 'U', (char *) &world.seed_map))
+    else if (parse_val(tok0, tok1, s[CMD_SEED_MAP],'U',(char *)&world.seed_map))
 
     {
         remake_map();
     }
-    else if (parse_val(tok0, tok1, s[CMD_MAKE_WORLD], 'U', (char *) &world.seed))
+    else if (parse_val(tok0, tok1, s[CMD_MAKE_WORLD],'U', (char *) &world.seed))
     {
         remake_world();
     }