mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

windows: Fix various memory leaks.

Browse Source 
This fixes bug #419.
This commit is contained in:
Aurelien Jacobs 2014-09-24 12:44:40 +02:00
parent 276ef1b92f
commit 7aeb6736bd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
windows.c
View File

@ -359,8 +359,10 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
continue; continue;
size = sizeof(value); size = sizeof(value);
if (RegQueryValueExA(device_key, "PortName", NULL, &type, (LPBYTE)value, if (RegQueryValueExA(device_key, "PortName", NULL, &type, (LPBYTE)value,
&size) != ERROR_SUCCESS || type != REG_SZ) &size) != ERROR_SUCCESS || type != REG_SZ) {
RegCloseKey(device_key);
continue; continue;
}
RegCloseKey(device_key); RegCloseKey(device_key);
value[sizeof(value)-1] = 0; value[sizeof(value)-1] = 0;
if (strcmp(value, port->name)) if (strcmp(value, port->name))
@ -452,6 +454,8 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
break; break;
} }
SetupDiDestroyDeviceInfoList(device_info);
RETURN_OK(); RETURN_OK();
} }
@ -494,6 +498,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
RegEnumValue(key, index, value, &value_len, RegEnumValue(key, index, value, &value_len,
NULL, &type, (LPBYTE)data, &data_size) == ERROR_SUCCESS) NULL, &type, (LPBYTE)data, &data_size) == ERROR_SUCCESS)
{ {
if (type == REG_SZ) {
data_len = data_size / sizeof(TCHAR); data_len = data_size / sizeof(TCHAR);
data[data_len] = '\0'; data[data_len] = '\0';
#ifdef UNICODE #ifdef UNICODE
@ -510,12 +515,13 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
#else #else
strcpy(name, data); strcpy(name, data);
#endif #endif
if (type == REG_SZ) {
DEBUG_FMT("Found port %s", name); DEBUG_FMT("Found port %s", name);
if (!(*list = list_append(*list, name))) { if (!(*list = list_append(*list, name))) {
SET_ERROR(ret, SP_ERR_MEM, "list append failed"); SET_ERROR(ret, SP_ERR_MEM, "list append failed");
free(name);
goto out; goto out;
} }
free(name);
} }
index++; index++;
} }