godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak in NetworkedMultiplayerENet.

Browse Source 
Dynamically allocated ids of peers where not correctly freed when
calling close_connection and disconnect_peer (with now=true).
This commit is contained in:
Fabio Alessandrelli 2019-11-26 15:28:20 +01:00
parent 8ea909f5b6
commit 391f6ff2c6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/enet/networked_multiplayer_enet.cpp
View File

@ -440,6 +440,8 @@ void NetworkedMultiplayerENet::close_connection(uint32_t wait_usec) {
for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) { for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
if (E->get()) { if (E->get()) {
enet_peer_disconnect_now(E->get(), unique_id); enet_peer_disconnect_now(E->get(), unique_id);
int *id = (int *)(E->get()->data);
memdelete(id);
peers_disconnected = true; peers_disconnected = true;
} }
} }
@ -455,6 +457,7 @@ void NetworkedMultiplayerENet::close_connection(uint32_t wait_usec) {
enet_host_destroy(host); enet_host_destroy(host);
active = false; active = false;
incoming_packets.clear(); incoming_packets.clear();
peer_map.clear();
unique_id = 1; // Server is 1 unique_id = 1; // Server is 1
connection_status = CONNECTION_DISCONNECTED; connection_status = CONNECTION_DISCONNECTED;
} }
@ -471,10 +474,13 @@ void NetworkedMultiplayerENet::disconnect_peer(int p_peer, bool now) {
// enet_peer_disconnect_now doesn't generate ENET_EVENT_TYPE_DISCONNECT, // enet_peer_disconnect_now doesn't generate ENET_EVENT_TYPE_DISCONNECT,
// notify everyone else, send disconnect signal & remove from peer_map like in poll() // notify everyone else, send disconnect signal & remove from peer_map like in poll()
int *id = NULL;
for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) { for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
if (E->key() == p_peer) if (E->key() == p_peer) {
id = (int *)(E->get()->data);
continue; continue;
}
ENetPacket *packet = enet_packet_create(NULL, 8, ENET_PACKET_FLAG_RELIABLE); ENetPacket *packet = enet_packet_create(NULL, 8, ENET_PACKET_FLAG_RELIABLE);
encode_uint32(SYSMSG_REMOVE_PEER, &packet->data[0]); encode_uint32(SYSMSG_REMOVE_PEER, &packet->data[0]);
@ -482,6 +488,9 @@ void NetworkedMultiplayerENet::disconnect_peer(int p_peer, bool now) {
enet_peer_send(E->get(), SYSCH_CONFIG, packet); enet_peer_send(E->get(), SYSCH_CONFIG, packet);
} }
if (id)
memdelete(id);
emit_signal("peer_disconnected", p_peer); emit_signal("peer_disconnected", p_peer);
peer_map.erase(p_peer); peer_map.erase(p_peer);
} else { } else {