Merge lp:~widelands-dev/widelands/bug_1826669_MapDownloandChange into lp:widelands/build20

[Klaus Halfmann]

Fix for #1826669

Avoid double delete of _file in gameclient.cc

[Klaus Halfmann (klaus-halfmann)]

This will merge to buld20.

I will try to do a bigger refactoring for trunk, but we should merge it there, too.

[Toni Förster (stonerl)]

Tested with Klaus and this fixes the crash.

review: Approve (testing, playing, compiling)

[GunChleoc (gunchleoc)]

I have an alternative fix that will use unique_ptr. We are trying to get away from raw delete calls. Tested with 2 Ubuntu machines.

https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366617

[GunChleoc (gunchleoc)]

Oops, wrong target branch. Take this one: https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366618

[GunChleoc (gunchleoc)]

Woohoo, forgot to tick the checkbox too. Now I finally have the correct target branch: https://code.launchpad.net/~widelands-dev/widelands/bug-1826669-mp-map-b20/+merge/366619

[hessenfarmer (stephan-lutz)]

Shouldn't this merge request being dropped an th branch abandoned since it was fixed by another branch?

[Toni Förster (stonerl)]

Set to rejected since we already have merged Gun's branch.

=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc	2019-02-23 11:00:49 +0000
+++ src/network/gameclient.cc	2019-04-28 12:08:11 +0000
@@ -586,8 +586,10 @@
 		    d->settings.mapfilename.c_str());
 
 		// New map was set, so we clean up the buffer of a previously requested file
-		if (file_)
-			delete file_;
+		if (file_) {
+		    delete file_;
+		    file_ = NULL;
+        	}
 		break;
 	}
 
@@ -637,8 +639,9 @@
 		s.unsigned_8(NETCMD_NEW_FILE_AVAILABLE);
 		d->net->send(s);
 
-		if (file_)
+		if (file_) {
 			delete file_;
+        	}
 
 		file_ = new NetTransferFile();
 		file_->bytes = bytes;

=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc	2019-02-23 11:00:49 +0000
+++ src/network/gamehost.cc	2019-04-28 12:08:11 +0000
@@ -539,7 +539,9 @@
 	d->net.reset();
 	d->promoter.reset();
 	delete d;
+	d = NULL;
 	delete file_;
+	file_ = NULL;
 }
 
 const std::string& GameHost::get_local_playername() const {

=== modified file 'src/network/network.h'
--- src/network/network.h	2019-02-23 11:00:49 +0000
+++ src/network/network.h	2019-04-28 12:08:11 +0000
@@ -185,6 +185,14 @@
 	std::string filename;
 	std::string md5sum;
 	std::vector<FilePart> parts;
+
+	NetTransferFile() {
+       		 // Allow Debugging
+	}
+
+    	~NetTransferFile() {
+        	 // Allow Debugging
+	}
 };
 
 class Deserializer {