Fix intlGUIEditBox leak and uninitialized value in Mapper (reported b…

…y valgrind)
minetest · Aug 10, 2015 · 6c0c27f · 6c0c27f
1 parent 1c408c4
commit 6c0c27f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
@@ -1020,6 +1020,7 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
 		if (g_settings->getBool("freetype")) {
 			e = (gui::IGUIElement *) new gui::intlGUIEditBox(spec.fdefault.c_str(),
 				true, Environment, this, spec.fid, rect);
+			e->drop();
 		} else {
 #else
 		{
@@ -1119,6 +1120,7 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
 		if (g_settings->getBool("freetype")) {
 			e = (gui::IGUIEditBox *) new gui::intlGUIEditBox(spec.fdefault.c_str(),
 				true, Environment, this, spec.fid, rect);
+			e->drop();
 		} else {
 #else
 		{

diff --git a/src/minimap.cpp b/src/minimap.cpp
@@ -224,12 +224,13 @@ Mapper::Mapper(IrrlichtDevice *device, Client *client)
 
 	// Initialize minimap data
 	data = new MinimapData;
-	data->mode            = MINIMAP_MODE_OFF;
-	data->is_radar        = false;
-	data->map_invalidated = true;
-	data->heightmap_image = NULL;
-	data->minimap_image   = NULL;
-	data->texture         = NULL;
+	data->mode              = MINIMAP_MODE_OFF;
+	data->is_radar          = false;
+	data->map_invalidated   = true;
+	data->heightmap_image   = NULL;
+	data->minimap_image     = NULL;
+	data->texture           = NULL;
+	data->heightmap_texture = NULL;
 	data->minimap_shape_round = g_settings->getBool("minimap_shape_round");
 
 	// Get round minimap textures