Merge pull request scp-fs2open#6723 from Goober5000/coverity_things

Goober5000 · web-flow · commit 6503b878fc6d · 2025-05-17T17:37:26.000-04:00
Various more Coverity issues
diff --git a/code/controlconfig/controlsconfig.cpp b/code/controlconfig/controlsconfig.cpp
@@ -1787,6 +1787,7 @@ bool control_config_create_new_preset(const SCP_string& newName, bool overwrite)
 	// Pack the current bindings into a preset, then save the file
 	CC_preset preset;
 	preset.name = newName;
+	preset.type = Preset_t::pst;
 	std::copy(Control_config.begin(), Control_config.end(), std::back_inserter(preset.bindings));
 
 	// Done with the file
diff --git a/code/controlconfig/controlsconfig.h b/code/controlconfig/controlsconfig.h
@@ -561,7 +561,7 @@ class CC_preset {
 public:
 	SCP_vector<CCB> bindings;
 	SCP_string name;
-	Preset_t type;
+	Preset_t type = Preset_t::hardcode;
 
 public:
 	CC_preset() = default;
diff --git a/code/fireball/fireballs.cpp b/code/fireball/fireballs.cpp
@@ -1232,6 +1232,7 @@ void fireball_render(object* obj, model_draw_list *scene)
 			float flare_rad = obj->radius * fi->flare_size_ratio;
 
 			matrix* warp_orientation;
+			matrix dest = ZERO_MATRIX;
 
 			// Flare animation selection
 			if (fi->warp_flare_style == warp_style::ENHANCED) {
@@ -1244,7 +1245,6 @@ void fireball_render(object* obj, model_draw_list *scene)
 
 			if (fi->warp_model_style == warp_style::CINEMATIC) {
 				matrix m = ZERO_MATRIX;
-				matrix dest = ZERO_MATRIX;
 
 				float duration_ratio = 2.0f / fb->warp_open_duration;
 
diff --git a/code/globalincs/utility.h b/code/globalincs/utility.h
@@ -162,7 +162,7 @@ typename T::size_type stringcost(const T& op, const T& input, typename T::size_t
 }
 
 template <typename VECTOR_T, typename ITEM_T, typename FIELD_T>
-int count_items_with_string(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field, const char* str)
+int count_items_with_string(const VECTOR_T& item_vector, FIELD_T* ITEM_T::* field, const char* str)
 {
 	int count = 0;
 	for (const ITEM_T& item : item_vector)
@@ -231,7 +231,7 @@ int count_items_with_field(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field,
 }
 
 template <typename ITEM_T, typename FIELD_T>
-int count_items_with_string(const ITEM_T* item_array, int num_items, FIELD_T ITEM_T::* field, const char* str)
+int count_items_with_string(const ITEM_T* item_array, int num_items, FIELD_T* ITEM_T::* field, const char* str)
 {
 	if (item_array == nullptr)
 		return 0;
@@ -308,7 +308,7 @@ int count_items_with_field(const ITEM_T* item_array, int num_items, FIELD_T ITEM
 }
 
 template <typename VECTOR_T, typename ITEM_T, typename FIELD_T>
-int find_item_with_string(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field, const char* str)
+int find_item_with_string(const VECTOR_T& item_vector, FIELD_T* ITEM_T::* field, const char* str)
 {
 	int index = 0;
 	for (const ITEM_T& item : item_vector)
@@ -385,7 +385,7 @@ int find_item_with_field(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field, c
 }
 
 template <typename ITEM_T, typename FIELD_T>
-int find_item_with_string(const ITEM_T* item_array, int num_items, FIELD_T ITEM_T::* field, const char* str)
+int find_item_with_string(const ITEM_T* item_array, int num_items, FIELD_T* ITEM_T::* field, const char* str)
 {
 	if (item_array == nullptr)
 		return -1;
diff --git a/code/hud/hudconfig.h b/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
diff --git a/code/hud/hudtargetbox.cpp b/code/hud/hudtargetbox.cpp
@@ -547,6 +547,10 @@ void HudGaugeTargetBox::renderTargetIntegrity(int disabled,int force_obj_num, bo
 		case TS_CRT:
 			strcpy_s(buf,XSTR( "crt", 347));
 			break;
+		default:
+			UNREACHABLE("Unhandled target integrity status %d in HudGaugeTargetBox::renderTargetIntegrity!", status);
+			buf[0] = '\0';
+			break;
 	}
 
 	if (!config) {
diff --git a/code/lab/renderer/lab_renderer.h b/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;
 		}
 	}
diff --git a/code/missionui/missiondebrief.cpp b/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
diff --git a/code/model/modelread.cpp b/code/model/modelread.cpp
@@ -5890,7 +5890,7 @@ void parse_glowpoint_table(const char *filename)
 			}
 
 			if (optional_string("$Texture:")) {
-				char glow_texture_name[32];
+				char glow_texture_name[NAME_LENGTH];
 				stuff_string(glow_texture_name, F_NAME, NAME_LENGTH);
 
 				gpo.glow_bitmap_override = true;
@@ -5907,10 +5907,18 @@ void parse_glowpoint_table(const char *filename)
 						nprintf(("Model", "Glowpoint preset %s texture num is %d\n", gpo.name, gpo.glow_bitmap));
 					}
 
-					char glow_texture_neb_name[256];
-					strncpy(glow_texture_neb_name, glow_texture_name, 256);
-					strcat(glow_texture_neb_name, "-neb");
-					gpo.glow_neb_bitmap = bm_load(glow_texture_neb_name);
+					if (strlen(glow_texture_name) > MAX_FILENAME_LEN - 4 - 1)
+					{
+						nprintf(("Model", "Texture '%s' referenced by glowpoint preset '%s' is too long for the -neb suffix!\n", glow_texture_name, gpo.name));
+						gpo.glow_neb_bitmap = -1;
+					}
+					else
+					{
+						char glow_texture_neb_name[MAX_FILENAME_LEN];
+						strcpy_s(glow_texture_neb_name, glow_texture_name);
+						strcat_s(glow_texture_neb_name, "-neb");
+						gpo.glow_neb_bitmap = bm_load(glow_texture_neb_name);
+					}
 
 					if (gpo.glow_neb_bitmap < 0)
 					{
diff --git a/code/parse/parselo.cpp b/code/parse/parselo.cpp
@@ -4004,7 +4004,7 @@ SCP_vector<std::pair<size_t, size_t>> str_wrap_to_width(const SCP_string& source
 			lines.emplace_back(pos_start, 0);
 		} else {
 			auto sublines = str_wrap_to_width(source_string, max_pixel_width, strip_leading_whitespace, pos_start, (newline_at - pos_start));
-			lines.reserve(lines.size() + sublines.size());
+			lines.reserve(lines.size() + sublines.size());	// coverity[inefficient_reserve:FALSE]
 			std::move(sublines.begin(), sublines.end(), std::back_inserter(lines));
 		}
 
@@ -4032,7 +4032,7 @@ SCP_vector<std::pair<size_t, size_t>> str_wrap_to_width(const SCP_string& source
 			size_t search_min = 0;
 			size_t search_max = stringlen;
 			size_t center = 0;
-			while ((search_max - search_min) > 0) {
+			while (search_max > search_min) {
 				center = search_min + ((search_max - search_min) / 2);
 				gr_get_string_size(&line_width, nullptr, source_string.c_str() + pos_start, 1.0f, center);
 				if (line_width == max_pixel_width) {
@@ -4107,7 +4107,7 @@ SCP_vector<std::pair<size_t, size_t>> str_wrap_to_width(const char* source_strin
 				for (auto& subline : sublines)
 					subline.first += (ch_start - source_string);
 
-			lines.reserve(lines.size() + sublines.size());
+			lines.reserve(lines.size() + sublines.size());	// coverity[inefficient_reserve:FALSE]
 			std::move(sublines.begin(), sublines.end(), std::back_inserter(lines));
 		}
 
@@ -4135,7 +4135,7 @@ SCP_vector<std::pair<size_t, size_t>> str_wrap_to_width(const char* source_strin
 			size_t search_min = 0;
 			size_t search_max = stringlen;
 			size_t center = 0;
-			while ((search_max - search_min) > 0) {
+			while (search_max > search_min) {
 				center = search_min + ((search_max - search_min) / 2);
 				gr_get_string_size(&line_width, nullptr, ch_start, 1.0f, center);
 				if (line_width == max_pixel_width) {
diff --git a/code/parse/sexp/sexp_lookup.cpp b/code/parse/sexp/sexp_lookup.cpp
@@ -238,16 +238,16 @@ int add_dynamic_sexp(std::unique_ptr<DynamicSEXP>&& sexp, sexp_oper_type type)
 	new_op.type = type;
 
 	sexp_help_struct new_help;
-	new_help.id = new_op.value;
+	new_help.id = free_op_index;
 	new_help.help = sexp->getHelpText();
 
-	global.operator_const_mapping.insert(std::make_pair(new_op.value, std::move(sexp)));
+	global.operator_const_mapping.insert(std::make_pair(free_op_index, std::move(sexp)));
 
 	// Now actually add the operator to the SEXP containers
 	Operators.push_back(std::move(new_op));
 	Sexp_help.push_back(std::move(new_help));
 
-	return new_op.value;
+	return free_op_index;
 }
 DynamicSEXP* get_dynamic_sexp(int operator_const)
 {
diff --git a/code/pilotfile/csg_convert.cpp b/code/pilotfile/csg_convert.cpp
@@ -656,7 +656,8 @@ void pilotfile_convert::csg_import(bool inferno)
 
 	csg_import_missions(inferno);
 
-	csg->main_hall = cfread_ubyte(cfp);
+	ubyte hall_index = cfread_ubyte(cfp);
+	sprintf(csg->main_hall, "%u", hall_index);
 
 	csg_import_red_alert();
 
diff --git a/code/scripting/scripting.cpp b/code/scripting/scripting.cpp
@@ -931,7 +931,7 @@ bool script_state::ParseCondition(const char *filename)
 			bool found = false;
 			pause_parse();
 			SCP_vm_unique_ptr<char> parse{ vm_strdup(local_condition.c_str()) };
-			reset_parse(parse.get());
+			reset_parse(parse.get());	// coverity[escape:FALSE] - this is okay because the pointer escape only lasts until unpause_parse() restores the old state
 			for (const auto& potential_condition : currHook->_conditions) {
 				SCP_string bufCond;
 				sprintf(bufCond, "$%s:", potential_condition.first.c_str());
diff --git a/code/tracing/FrameProfiler.cpp b/code/tracing/FrameProfiler.cpp
@@ -51,6 +51,7 @@ void process_begin(SCP_vector<profile_sample>& samples, const trace_event& evt)
 	new_sample.children_sample_time = 0;
 	new_sample.num_children = 0;
 	new_sample.parent = parent;
+	new_sample.num_parents = (parent >= 0) ? 1 : 0;
 
 	samples.push_back(new_sample);
 }
diff --git a/code/tracing/FrameProfiler.h b/code/tracing/FrameProfiler.h
@@ -25,7 +25,6 @@ struct profile_sample_history {
 struct profile_sample {
 	uint profile_instances;
 	int open_profiles;
-	//char name[256];
 	SCP_string name;
 	uint64_t start_time;    // in microseconds
 	uint64_t accumulator;

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ typename T::size_type stringcost(const T& op, const T& input, typename T::size_t`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`template <typename VECTOR_T, typename ITEM_T, typename FIELD_T>`
`165`		`-int count_items_with_string(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field, const char* str)`
	`165`	`+int count_items_with_string(const VECTOR_T& item_vector, FIELD_T* ITEM_T::* field, const char* str)`
`166`	`166`	`{`
`167`	`167`	`int count = 0;`
`168`	`168`	`for (const ITEM_T& item : item_vector)`
`@@ -231,7 +231,7 @@ int count_items_with_field(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field,`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`template <typename ITEM_T, typename FIELD_T>`
`234`		`-int count_items_with_string(const ITEM_T* item_array, int num_items, FIELD_T ITEM_T::* field, const char* str)`
	`234`	`+int count_items_with_string(const ITEM_T* item_array, int num_items, FIELD_T* ITEM_T::* field, const char* str)`
`235`	`235`	`{`
`236`	`236`	`if (item_array == nullptr)`
`237`	`237`	`return 0;`
`@@ -308,7 +308,7 @@ int count_items_with_field(const ITEM_T* item_array, int num_items, FIELD_T ITEM`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`template <typename VECTOR_T, typename ITEM_T, typename FIELD_T>`
`311`		`-int find_item_with_string(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field, const char* str)`
	`311`	`+int find_item_with_string(const VECTOR_T& item_vector, FIELD_T* ITEM_T::* field, const char* str)`
`312`	`312`	`{`
`313`	`313`	`int index = 0;`
`314`	`314`	`for (const ITEM_T& item : item_vector)`
`@@ -385,7 +385,7 @@ int find_item_with_field(const VECTOR_T& item_vector, FIELD_T ITEM_T::* field, c`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`template <typename ITEM_T, typename FIELD_T>`
`388`		`-int find_item_with_string(const ITEM_T* item_array, int num_items, FIELD_T ITEM_T::* field, const char* str)`
	`388`	`+int find_item_with_string(const ITEM_T* item_array, int num_items, FIELD_T* ITEM_T::* field, const char* str)`
`389`	`389`	`{`
`390`	`390`	`if (item_array == nullptr)`
`391`	`391`	`return -1;`