From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Sat, 1 Apr 2017 08:18:13 +0000 (+0200)
Subject: mapgen: Fix segfault when selecting invalid mapgen (#5491)
X-Git-Tag: 0.4.16~335
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=773efc19b1d05e573d5bc811c0175d192f7c12c5;p=oweals%2Fminetest.git

mapgen: Fix segfault when selecting invalid mapgen (#5491)
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 6f3ea7cb0..b6e8c0fd1 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1003,8 +1003,11 @@ void MapgenParams::readParams(const Settings *settings)
 	}
 
 	std::string mg_name;
-	if (settings->getNoEx("mg_name", mg_name))
-		this->mgtype = Mapgen::getMapgenType(mg_name);
+	if (settings->getNoEx("mg_name", mg_name)) {
+		mgtype = Mapgen::getMapgenType(mg_name);
+		if (mgtype == MAPGEN_INVALID)
+			mgtype = MAPGEN_DEFAULT;
+	}
 
 	settings->getS16NoEx("water_level", water_level);
 	settings->getS16NoEx("mapgen_limit", mapgen_limit);