fix a segfault

scope_active_.size() = SCOPE_COUNT, so scope_active_[SCOPE_COUNT] is undefined behaviour. it seems like in add_hotkey it can happen that hotkey::get_hotkey_command(item.get_command()).scope return SCOPE_COUNT for wml hotkeys
wesnoth · Jun 18, 2014 · 0ac8508 · 0ac8508
1 parent d5cc615
commit 0ac8508
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/hotkey/hotkey_command.cpp b/src/hotkey/hotkey_command.cpp
@@ -293,6 +293,8 @@ void set_scope_active(scope s, bool set)
 
 bool is_scope_active(scope s)
 {
+	if( s == hotkey::SCOPE_COUNT )
+		return false;
 	return scope_active_[s];
 }
 

diff --git a/src/hotkey/hotkey_item.cpp b/src/hotkey/hotkey_item.cpp
@@ -236,6 +236,8 @@ bool has_hotkey_item(const std::string& command)
 void add_hotkey(const hotkey_item& item) {
 
 	scope new_scope = hotkey::get_hotkey_command(item.get_command()).scope;
+	if(new_scope == hotkey::SCOPE_COUNT)
+		new_scope = hotkey::SCOPE_GAME;
 	scope_changer scope_ch;
 	deactivate_all_scopes();
 	hotkey::set_scope_active(new_scope);