godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use local variable to stop memory leak.

Browse Source 
I've change the urls variable to be a local, instead of manually allocating it all the time.
This is only used locally and was causing a memory leak because FreeUPNPUrls gave the impression it free it.

1. FreeUPNPUrls doesn't free the pointer passed in, that's up to caller.
2. The second if(!urls) produced dead code as we checked the pointer just after allocation.
This commit is contained in:
Alistair Leslie-Hughes
2024-03-26 13:13:43 +11:00
parent 79de2eaae7
commit 767bfec8b6
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/upnp/upnp.cpp
View File

@@ -121,33 +121,20 @@ void UPNP::parse_igd(Ref<UPNPDevice> dev, UPNPDev *devlist) {
return;
}
struct UPNPUrls *urls = (UPNPUrls *)malloc(sizeof(struct UPNPUrls));
if (!urls) {
dev->set_igd_status(UPNPDevice::IGD_STATUS_MALLOC_ERROR);
return;
}
struct UPNPUrls urls = {};
struct IGDdatas data;
memset(urls, 0, sizeof(struct UPNPUrls));
parserootdesc(xml, size, &data);
free(xml);
xml = nullptr;
GetUPNPUrls(urls, &data, dev->get_description_url().utf8().get_data(), 0);
if (!urls) {
dev->set_igd_status(UPNPDevice::IGD_STATUS_NO_URLS);
return;
}
GetUPNPUrls(&urls, &data, dev->get_description_url().utf8().get_data(), 0);
char addr[16];
int i = UPNP_GetValidIGD(devlist, urls, &data, (char *)&addr, 16);
int i = UPNP_GetValidIGD(devlist, &urls, &data, (char *)&addr, 16);
if (i != 1) {
FreeUPNPUrls(urls);
FreeUPNPUrls(&urls);
switch (i) {
case 0:
@@ -165,18 +152,18 @@ void UPNP::parse_igd(Ref<UPNPDevice> dev, UPNPDev *devlist) {
}
}
if (urls->controlURL[0] == '\0') {
FreeUPNPUrls(urls);
if (urls.controlURL[0] == '\0') {
FreeUPNPUrls(&urls);
dev->set_igd_status(UPNPDevice::IGD_STATUS_INVALID_CONTROL);
return;
}
dev->set_igd_control_url(urls->controlURL);
dev->set_igd_control_url(urls.controlURL);
dev->set_igd_service_type(data.first.servicetype);
dev->set_igd_our_addr(addr);
dev->set_igd_status(UPNPDevice::IGD_STATUS_OK);
FreeUPNPUrls(urls);
FreeUPNPUrls(&urls);
}
int UPNP::upnp_result(int in) {