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

Attempt to fix some minor memory leaks

master
Perttu Ahola 2012-03-20 17:55:34 +02:00
parent 94f1ab4da3
commit c0530921ff
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/connection.cpp
View File

@ -537,6 +537,14 @@ Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
Connection::~Connection() Connection::~Connection()
{ {
stop(); stop();
// Delete peers
for(core::map<u16, Peer*>::Iterator
j = m_peers.getIterator();
j.atEnd() == false; j++)
{
Peer *peer = j.getNode()->getValue();
delete peer;
}
} }
/* Internal stuff */ /* Internal stuff */

7
src/itemdef.cpp
View File

@ -290,8 +290,11 @@ public:
// Ensure that the "" item (the hand) always has ToolCapabilities // Ensure that the "" item (the hand) always has ToolCapabilities
if(def.name == "") if(def.name == "")
assert(def.tool_capabilities != NULL); assert(def.tool_capabilities != NULL);
m_item_definitions[def.name] = new ItemDefinition(def); if(m_item_definitions.count(def.name) == 0)
m_item_definitions[def.name] = new ItemDefinition(def);
else
*(m_item_definitions[def.name]) = def;
// Remove conflicting alias if it exists // Remove conflicting alias if it exists
bool alias_removed = (m_aliases.erase(def.name) != 0); bool alias_removed = (m_aliases.erase(def.name) != 0);