asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #51200 from timothyqiu/enet-memleak

Browse source 
[3.x] Fix `NetworkedMultiplayerENet` client memory leak
This commit is contained in:
Rémi Verschelde 2021-08-03 08:10:26 +02:00 committed by GitHub
commit 38d47c051a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/enet/networked_multiplayer_enet.cpp
View file

@ -174,14 +174,20 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
ip = IP::get_singleton()->resolve_hostname(p_address, IP::TYPE_IPV4); ip = IP::get_singleton()->resolve_hostname(p_address, IP::TYPE_IPV4);
#endif #endif
ERR_FAIL_COND_V_MSG(!ip.is_valid(), ERR_CANT_RESOLVE, "Couldn't resolve the server IP address or domain name."); if (!ip.is_valid()) {
enet_host_destroy(host);
ERR_FAIL_V_MSG(ERR_CANT_RESOLVE, "Couldn't resolve the server IP address or domain name.");
}
} }
ENetAddress address; ENetAddress address;
#ifdef GODOT_ENET #ifdef GODOT_ENET
enet_address_set_ip(&address, ip.get_ipv6(), 16); enet_address_set_ip(&address, ip.get_ipv6(), 16);
#else #else
ERR_FAIL_COND_V_MSG(!ip.is_ipv4(), ERR_INVALID_PARAMETER, "Connecting to an IPv6 server isn't supported when using vanilla ENet. Recompile Godot with the bundled ENet library."); if (!ip.is_ipv4()) {
enet_host_destroy(host);
ERR_FAIL_V_MSG(ERR_INVALID_PARAMETER, "Connecting to an IPv6 server isn't supported when using vanilla ENet. Recompile Godot with the bundled ENet library.");
}
address.host = *(uint32_t *)ip.get_ipv4(); address.host = *(uint32_t *)ip.get_ipv4();
#endif #endif
address.port = p_port; address.port = p_port;
@ -193,7 +199,7 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
if (peer == nullptr) { if (peer == nullptr) {
enet_host_destroy(host); enet_host_destroy(host);
ERR_FAIL_COND_V_MSG(!peer, ERR_CANT_CREATE, "Couldn't connect to the ENet multiplayer server."); ERR_FAIL_V_MSG(ERR_CANT_CREATE, "Couldn't connect to the ENet multiplayer server.");
} }
// Technically safe to ignore the peer or anything else. // Technically safe to ignore the peer or anything else.