check for malloc failures

src/main.c

@@ -100,6 +100,13 @@ static void game_init(state_st *state)
   // generate random names for items
   for (i = 0; i < NUM_SCROLLS; ++i) {
     state->scroll_names[i] = calloc(ITEM_NAME_MAX, sizeof(char));
+    if (!state->scroll_names[i]) {
+      endwin();
+      fprintf(stderr, "%s:%d - %s() - out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+      free_state(state); 
+      exit(EXIT_FAILURE);
+    }
+
     random_string(state->scroll_names[i], ITEM_NAME_MAX-1);
   }
 

src/rogue.c

@@ -227,6 +227,12 @@ void rings_init(state_st *state)
 
   for (i = 0; i < NUM_RINGS; ++i) {
     state->ring_names[i] = strdup(ring_types[indices[i]]);
+    if (!state->ring_names[i]) {
+      endwin();
+      fprintf(stderr, "%s:%d - %s() - out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+      free_state(state); 
+      exit(EXIT_FAILURE);
+    }
   }
 
 }
@@ -245,6 +251,12 @@ void potions_init(state_st *state)
 
   for (i = 0; i < NUM_POTIONS; ++i) {
     state->potion_names[i] = strdup(potion_types[indices[i]]);
+    if (!state->potion_names[i]) {
+      endwin();
+      fprintf(stderr, "%s:%d - %s() - out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+      free_state(state); 
+      exit(EXIT_FAILURE);
+    }
   }
 
 }
@@ -263,6 +275,12 @@ void wands_init(state_st *state)
 
   for (i = 0; i < NUM_WANDS; ++i) {
     state->wand_names[i] = strdup(wand_types[indices[i]]);
+    if (!state->wand_names[i]) {
+      endwin();
+      fprintf(stderr, "%s:%d - %s() - out of memory\n", __FILE__, __LINE__, __FUNCTION__);
+      free_state(state); 
+      exit(EXIT_FAILURE);
+    }
   }
 
 }

src/rogue.h

@@ -64,6 +64,11 @@
 // and bottom row for stats
 #define MAP_ROW MIN_ROW - 2
 
+// min/max # of rooms, and minimum room dimensions
+#define ROOMS_MAX 9
+#define ROOMS_MIN 3
+#define ROOM_DIM_MIN 4
+
 // max number of doors per room
 #define MAX_DOORS 4