[Scummvm-git-logs] scummvm master -> a026115c3ceb61f5cc8c8208909136b8434aceca

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a026115c3c ULTIMA: NUVIE: Fix some coverity issues


Commit: a026115c3ceb61f5cc8c8208909136b8434aceca
    https://github.com/scummvm/scummvm/commit/a026115c3ceb61f5cc8c8208909136b8434aceca
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-05T21:31:56+09:00

Commit Message:
ULTIMA: NUVIE: Fix some coverity issues

Changed paths:
    engines/ultima/nuvie/files/nuvie_file_list.cpp
    engines/ultima/nuvie/files/u6_lib_n.cpp
    engines/ultima/nuvie/gui/gui_text_input.cpp
    engines/ultima/nuvie/gui/widgets/converse_gump.cpp
    engines/ultima/nuvie/gui/widgets/msg_scroll.cpp


diff --git a/engines/ultima/nuvie/files/nuvie_file_list.cpp b/engines/ultima/nuvie/files/nuvie_file_list.cpp
index fe20af4b75..ace1fb69ed 100644
--- a/engines/ultima/nuvie/files/nuvie_file_list.cpp
+++ b/engines/ultima/nuvie/files/nuvie_file_list.cpp
@@ -30,7 +30,7 @@
 namespace Ultima {
 namespace Nuvie {
 
-NuvieFileList::NuvieFileList() {
+NuvieFileList::NuvieFileList() : sort_mode(NUVIE_SORT_NAME_ASC) {
 }
 
 NuvieFileList::~NuvieFileList() {
@@ -48,7 +48,10 @@ bool NuvieFileList::open(const char *directory, const char *search, uint8 s_mode
 		return false;
 	}
 
-	dir.getChildren(list, Common::FSNode::kListFilesOnly);
+	if (!dir.getChildren(list, Common::FSNode::kListFilesOnly)) {
+		ConsoleAddWarning(Std::string("Failed to get children of ") + directory);
+		return false;
+	};
 	for (Common::FSList::iterator it = list.begin(); it != list.end(); ++it)
 		add_filename(*it);
 
diff --git a/engines/ultima/nuvie/files/u6_lib_n.cpp b/engines/ultima/nuvie/files/u6_lib_n.cpp
index db658f4134..1fc809f2f9 100644
--- a/engines/ultima/nuvie/files/u6_lib_n.cpp
+++ b/engines/ultima/nuvie/files/u6_lib_n.cpp
@@ -29,11 +29,8 @@
 namespace Ultima {
 namespace Nuvie {
 
-U6Lib_n::U6Lib_n() {
-	num_offsets = 0;
-	items = NULL;
-	data = NULL;
-	del_data = false;
+U6Lib_n::U6Lib_n() : num_offsets(0), items(NULL), data(NULL),
+	del_data(false), filesize(0), game_type(NUVIE_GAME_U6), lib_size(0) {
 }
 
 
diff --git a/engines/ultima/nuvie/gui/gui_text_input.cpp b/engines/ultima/nuvie/gui/gui_text_input.cpp
index e6cc43ebb3..8e62ea7b14 100644
--- a/engines/ultima/nuvie/gui/gui_text_input.cpp
+++ b/engines/ultima/nuvie/gui/gui_text_input.cpp
@@ -114,8 +114,10 @@ GUI_status GUI_TextInput::KeyDown(const Common::KeyState &keyState) {
 			break;
 		case HOME_KEY:
 			key.keycode = Common::KEYCODE_HOME;
+			break;
 		case END_KEY:
 			key.keycode = Common::KEYCODE_END;
+			break;
 		default :
 			if (keybinder->handle_always_available_keys(a)) return GUI_YUM;
 			break;
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.cpp b/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
index 9cfc796385..c0d0b635b1 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
@@ -496,7 +496,7 @@ bool ConverseGump::input_buf_add_char(char c) {
 	input_char = 0;
 	if (permit_input != NULL)
 		input_buf_remove_char();
-	input_buf.append(&c, 1);
+	input_buf.push_back(c);
 	return true;
 }
 
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
index e58469777a..292a18cc3d 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
@@ -1042,7 +1042,7 @@ bool MsgScroll::input_buf_add_char(char c) {
 	input_char = 0;
 	if (permit_input != NULL)
 		input_buf_remove_char();
-	input_buf.append(1, c);
+	input_buf.push_back(c);
 	scroll_updated = true;
 
 // Add char to scroll buffer