sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix intlGUIEditBox leak and uninitialized value in Mapper (reported by valgrind)

master
Kahrl 2015-08-10 08:36:55 +02:00
parent 1c408c4f1d
commit 6c0c27f662
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/guiFormSpecMenu.cpp
View File

@ -1020,6 +1020,7 @@ void GUIFormSpecMenu::parseSimpleField(parserData* data,
if (g_settings->getBool("freetype")) { if (g_settings->getBool("freetype")) {
e = (gui::IGUIElement *) new gui::intlGUIEditBox(spec.fdefault.c_str(), e = (gui::IGUIElement *) new gui::intlGUIEditBox(spec.fdefault.c_str(),
true, Environment, this, spec.fid, rect); true, Environment, this, spec.fid, rect);
e->drop();
} else { } else {
#else #else
{ {
@ -1119,6 +1120,7 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,
if (g_settings->getBool("freetype")) { if (g_settings->getBool("freetype")) {
e = (gui::IGUIEditBox *) new gui::intlGUIEditBox(spec.fdefault.c_str(), e = (gui::IGUIEditBox *) new gui::intlGUIEditBox(spec.fdefault.c_str(),
true, Environment, this, spec.fid, rect); true, Environment, this, spec.fid, rect);
e->drop();
} else { } else {
#else #else
{ {

13
src/minimap.cpp
View File

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