Enable UBSan and fix sanitizer findings

Author: gtaylor

CMakeLists.txt

@@ -43,6 +43,7 @@ option(BTECH_SCALED_INFRARED "Scale infrared BTH with increasing heat" ON)
 option(BTECH_OVERSPEEDING "Allow mech overspeeding" OFF)
 
 option(BTECH_ENABLE_ASAN "Build with AddressSanitizer instrumentation" ON)
+option(BTECH_ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer instrumentation" ON)
 option(BTECH_ENABLE_CLANG_TIDY "Run clang-tidy during compilation" OFF)
 
 if(BTECH_ENABLE_CLANG_TIDY)
@@ -171,6 +172,10 @@ if(BTECH_ENABLE_ASAN)
   target_compile_options(btmux_options INTERFACE -fsanitize=address)
   target_link_options(btmux_options INTERFACE -fsanitize=address)
 endif()
+if(BTECH_ENABLE_UBSAN)
+  target_compile_options(btmux_options INTERFACE -fsanitize=undefined)
+  target_link_options(btmux_options INTERFACE -fsanitize=undefined)
+endif()
 
 set(BTECH_SOURCES
   ${BTECH_SOURCE_DIR}/src/btech_context.c

src/btech/persistence/btech_persistence_sqlite.c

@@ -681,8 +681,10 @@ static int btech_special_resize_map(MAP *map, int width, int height) {
 static int btech_special_allocate_map_dynamic(MAP *map) {
   int index;
 
-  if (!map->first_free)
+  if (!map->first_free) {
+    map->dynamic_size = 0;
     return 0;
+  }
   map->mechsOnMap = calloc(map->first_free, sizeof(*map->mechsOnMap));
   map->mechflags = calloc(map->first_free, sizeof(*map->mechflags));
   map->LOSinfo = calloc(map->first_free, sizeof(*map->LOSinfo));
@@ -692,8 +694,10 @@ static int btech_special_allocate_map_dynamic(MAP *map) {
     map->LOSinfo[index] = calloc(map->first_free, sizeof(*map->LOSinfo[index]));
   }
   if (map->mechsOnMap && map->mechflags && map->LOSinfo &&
-      index == map->first_free)
+      index == map->first_free) {
+    map->dynamic_size = map->first_free;
     return 0;
+  }
   if (map->LOSinfo)
     for (index = 0; index < map->first_free; index++)
       free(map->LOSinfo[index]);
@@ -703,6 +707,7 @@ static int btech_special_allocate_map_dynamic(MAP *map) {
   map->LOSinfo = NULL;
   map->mechflags = NULL;
   map->mechsOnMap = NULL;
+  map->dynamic_size = 0;
   return -1;
 }
 

src/btech/src/btech/autopilot_ai.c

@@ -911,7 +911,12 @@ static astar_node *auto_create_astar_node(short x, short y, short x_parent,
  *
  * Returns 1 if it found a path and 0 if it doesn't
  */
-int astar_compare(int a, int b, void *arg) { return a - b; }
+static int astar_compare(void *left_key, void *right_key, void *arg) {
+  const long left = (long)left_key;
+  const long right = (long)right_key;
+
+  return (left > right) - (left < right);
+}
 void astar_release(void *key, void *data) { free(data); }
 int auto_astar_generate_path(AUTO *autopilot, MECH *mech, short end_x,
                              short end_y) {
@@ -964,9 +969,9 @@ int auto_astar_generate_path(AUTO *autopilot, MECH *mech, short end_x,
   memset(open_list_bitfield, 0, sizeof(open_list_bitfield));
 
   /* Setup the trees */
-  open_list_by_score = red_black_tree_init((void *)astar_compare, NULL);
-  open_list_by_xy = red_black_tree_init((void *)astar_compare, NULL);
-  closed_list = red_black_tree_init((void *)astar_compare, NULL);
+  open_list_by_score = red_black_tree_init(astar_compare, NULL);
+  open_list_by_xy = red_black_tree_init(astar_compare, NULL);
+  closed_list = red_black_tree_init(astar_compare, NULL);
 
   /* Setup the path */
   /* Destroy any existing path first */

src/btech/src/btech/map.c

@@ -653,7 +653,9 @@ void newfreemap(DbRef key, void **data, int selector) {
       new->mapobj[i] = NULL;
     snprintf(new->mapname, MAP_NAME_SIZE, "%s", "Default Map");
     break;
-  case SPECIAL_FREE:
+  case SPECIAL_FREE: {
+    const int allocated_slots = new->dynamic_size;
+
     /* Seriously. We weren't clearing the map of mechas. Bad bad accounting!!!
      */
     map_clearmechs(GOD, new, "");
@@ -664,8 +666,15 @@ void newfreemap(DbRef key, void **data, int selector) {
           free((char *)(new->map[i]));
       free((char *)(new->map));
     }
+    if (new->LOSinfo)
+      for (i = 0; i < allocated_slots; i++)
+        free(new->LOSinfo[i]);
+    free(new->LOSinfo);
+    free(new->mechflags);
+    free(new->mechsOnMap);
     break;
   }
+  }
 }
 
 int map_sizefun(void *data, int flag) {

src/btech/src/btech/map.dynamic.c

@@ -79,6 +79,7 @@ void eliminate_empties(MAP *map) {
   ReCreate(map->mechflags, char, count);
 
   map->first_free = count;
+  map->dynamic_size = count;
   econ_fix_stuff(map->xcode.context, GOD, map->mynum);
 }
 
@@ -165,6 +166,7 @@ void add_mech_to_map(MAP *newmap, MECH *mech) {
     }
     for (i = 0; i < count; i++)
       newmap->LOSinfo[loop][i] = 0;
+    newmap->dynamic_size = count;
   }
   mech->mapindex = newmap->mynum;
   mech->mapnumber = loop;

src/btech/src/btech/map.h

@@ -197,6 +197,7 @@ typedef struct map_data {
   char buildflag;
 
   unsigned char first_free; /* First free on da map */
+  int dynamic_size;         /* Allocated occupancy/LOS matrix dimension. */
   DbRef *mechsOnMap;        /* Mechs on the map */
   unsigned short **LOSinfo; /* Line of sight info */
 

src/btech/src/btech/map.obj.c

@@ -126,6 +126,13 @@ void del_mapobj(MAP *map, mapobj *mapob, int type, int zap) {
       tmap->onmap = 0;
     }
   }
+  if (type == TYPE_BITS && mapob->datai != 0) {
+    unsigned char **bits = (unsigned char **)mapob->datai;
+
+    for (int y = 0; y < map->map_height; y++)
+      free(bits[y]);
+    free(bits);
+  }
   free(mapob);
 }
 

src/btech/src/btech/mech.restrict.c

@@ -19,6 +19,7 @@
 #include "p.mech.build.h"
 #include "p.mech.c3.h"
 #include "p.mech.c3i.h"
+#include "p.mech.update.h"
 #include "p.mech.utils.h"
 #include "p.mechrep.h"
 
@@ -255,6 +256,7 @@ void newfreemech(DbRef key, void **data, int selector) {
       FillDefaultCriticals(new, i);
     break;
   case SPECIAL_FREE:
+    ClearAllStaggerDamage(new);
     if (new->mapindex != -1 &&
         (map = btech_context_get_map(new->xcode.context, new->mapindex)))
       remove_mech_from_map(map, new);

src/btech/src/debug.c

@@ -176,7 +176,17 @@ void ShutDownMap(BtechContext *context, DbRef player, DbRef mapnumber) {
           remove_mech_from_map(map, mech);
         }
       }
+    if (map->LOSinfo)
+      for (j = 0; j < map->dynamic_size; j++)
+        free(map->LOSinfo[j]);
+    free(map->LOSinfo);
+    free(map->mechflags);
+    free(map->mechsOnMap);
+    map->LOSinfo = nullptr;
+    map->mechflags = nullptr;
+    map->mechsOnMap = nullptr;
     map->first_free = 0;
+    map->dynamic_size = 0;
     notify(btech_context_evaluation(context), player, "Map Cleared");
     return;
   }

src/mux/commands/command.c

@@ -405,6 +405,41 @@ void init_cmdtab(CommandRegistry *registry) {
   registry->goto_command = hash_table_find("goto", &registry->commands);
 }
 
+void command_aliases_destroy(HashTable *commands) {
+  CMDENT **aliases = nullptr;
+  size_t alias_count = 0;
+
+  if (commands == nullptr || commands->tree == nullptr)
+    return;
+  for (char *key = hash_table_first_key(commands); key != nullptr;
+       key = hash_table_next_key(commands)) {
+    CMDENT *command = hash_table_find(key, commands);
+    bool built_in = false;
+
+    for (CMDENT *candidate = command_table; candidate->cmdname; candidate++) {
+      if (command == candidate) {
+        built_in = true;
+        break;
+      }
+    }
+    if (built_in || strcasecmp(key, command->cmdname))
+      continue;
+    CMDENT **grown = realloc(aliases, (alias_count + 1) * sizeof(*aliases));
+    if (grown == nullptr)
+      break;
+    aliases = grown;
+    aliases[alias_count++] = command;
+  }
+  for (size_t index = 0; index < alias_count; index++) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-qual"
+    free((void *)aliases[index]->cmdname);
+#pragma clang diagnostic pop
+    free(aliases[index]);
+  }
+  free(aliases);
+}
+
 void set_prefix_cmds(CommandRegistry *registry) {
   /*
    * Load the command prefix table.  Note - these commands can never *