Settings: Fix crash on exit due to group double-free

minetest · Sep 21, 2020 · e7f33ee · e7f33ee
1 parent 49117de
commit e7f33ee
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -824,13 +824,21 @@ bool Settings::setDefault(const std::string &name, const std::string &value)
 
 bool Settings::setGroup(const std::string &name, Settings *group)
 {
-	return setEntry(name, &group, true, false);
+	// Settings must own the group pointer
+	// avoid double-free by copying the source
+	Settings *copy = new Settings();
+	*copy = *group;
+	return setEntry(name, &copy, true, false);
 }
 
 
 bool Settings::setGroupDefault(const std::string &name, Settings *group)
 {
-	return setEntry(name, &group, true, true);
+	// Settings must own the group pointer
+	// avoid double-free by copying the source
+	Settings *copy = new Settings();
+	*copy = *group;
+	return setEntry(name, &copy, true, true);
 }