Merge lp:~widelands-dev/widelands/bug-1819311-port-spaces-heap-use-after-free into lp:widelands

[GunChleoc]

Use temporary container in cleanup_port_spaces to prevent invalid iterators.

[Klaus Halfmann (klaus-halfmann)]

Fixed that bug, lets have it.

@bunnybot merge

review: Approve (compile, review, test)

[GunChleoc (gunchleoc)]

Thanks for the review :)

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4637. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/510593332.
Appveyor build 4424. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1819311_port_spaces_heap_use_after_free-4424.

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2019-03-11 11:42:03 +0000
+++ src/logic/map.cc	2019-03-24 13:16:37 +0000
@@ -411,7 +411,6 @@
 	background_ = std::string();
 
 	objectives_.clear();
-
 	port_spaces_.clear();
 	allows_seafaring_ = false;
 
@@ -2175,12 +2174,16 @@
 }
 
 void Map::cleanup_port_spaces(const World& world) {
+	// Temporary set to avoid problems with concurrent container operations
+	PortSpacesSet clean_me_up;
 	for (const Coords& c : get_port_spaces()) {
 		if (!is_port_space_allowed(world, get_fcoords(c))) {
-			set_port_space(world, c, false);
-			continue;
+			clean_me_up.insert(c);
 		}
 	}
+	for (const Coords& c : clean_me_up) {
+		set_port_space(world, c, false);
+	}
 	recalculate_allows_seafaring();
 }