array and iterator bounds

Author: Goober5000

code/hud/hudconfig.h

@@ -192,8 +192,9 @@ typedef struct HUD_CONFIG_TYPE {
 			const HC_gauge_mappings& gauge_map = HC_gauge_mappings::get_instance();
 
 			it = gauge_colors.find(gauge_map.get_string_id_from_numeric_id(type_it->second));
-
-			return it->second;
+			if (it != gauge_colors.end()) {
+				return it->second;
+			}
 		}
 
 		// Still nothing.. return white

code/lab/renderer/lab_renderer.h

@@ -127,24 +127,33 @@ class LabRenderer {
 	void useNextTeamColorPreset() {
 		if (!Team_Colors.empty()) {
 			auto color_itr = Team_Colors.find(currentTeamColor);
+			auto penultimate = Team_Colors.end();
+			penultimate--;
 
-			if (color_itr == Team_Colors.begin()) {
-				color_itr = --Team_Colors.end();
-				currentTeamColor = color_itr->first;
+			if (color_itr == Team_Colors.end()) {	// not found
+				color_itr = Team_Colors.begin();
+			} else if (color_itr == penultimate) {
+				color_itr = Team_Colors.begin();
 			} else {
-				--color_itr;
-				currentTeamColor = color_itr->first;
+				color_itr++;
 			}
+			currentTeamColor = color_itr->first;
 		}
 	}
 
 	void usePreviousTeamColorPreset() {
 		if (!Team_Colors.empty()) {
 			auto color_itr = Team_Colors.find(currentTeamColor);
+			auto penultimate = Team_Colors.end();
+			penultimate--;
 
-			++color_itr;
-			if (color_itr == Team_Colors.end())
+			if (color_itr == Team_Colors.end()) {	// not found
 				color_itr = Team_Colors.begin();
+			} else if (color_itr == Team_Colors.begin()) {
+				color_itr = penultimate;
+			} else {
+				color_itr--;
+			}
 			currentTeamColor = color_itr->first;
 		}
 	}

code/missionui/missiondebrief.cpp

@@ -2203,7 +2203,7 @@ void debrief_draw_award_text()
 	curr_y = start_y;
 
 	// draw the strings
-	for (i=0; i<Debrief_award_text_num_lines; i++) {
+	for (i=0; i<Debrief_award_text_num_lines && i < AWARD_TEXT_MAX_LINES; i++) {
 		gr_get_string_size(&sw, NULL, Debrief_award_text[i]);
 		x = (Medal_bitmap < 0) ? (Debrief_award_text_coords[gr_screen.res][0] + (field_width - sw) / 2) : Debrief_award_text_coords[gr_screen.res][0];
 		if (i==AWARD_TEXT_MAX_LINES-1) x += 7;				// hack because of the shape of the box