diff options
| author | Kahrl <kahrl@gmx.net> | 2015-08-10 08:36:55 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2015-08-10 08:41:45 +0200 |
| commit | 6c0c27f662dc1a41f3e9490eac32735b4e486a30 (patch) | |
| tree | 24b7fa33e3856e25dea8830123c929a340cc3c03 | |
| parent | 1c408c4f1df25ecec0dd8ea8b6cb00534e08bc66 (diff) | |
| download | minetest-6c0c27f662dc1a41f3e9490eac32735b4e486a30.tar.gz minetest-6c0c27f662dc1a41f3e9490eac32735b4e486a30.tar.bz2 minetest-6c0c27f662dc1a41f3e9490eac32735b4e486a30.zip | |
Fix intlGUIEditBox leak and uninitialized value in Mapper (reported by valgrind)
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 2 | ||||
| -rw-r--r-- | src/minimap.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index f16830619..62a84460f 100644 --- 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 index 950202c6a..d1fb3867d 100644 --- 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 |