X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=windows.c;h=38ea0cedef7349260c5af7623a268393fea2f914;hb=6c444ade550dcd1d911261a0e508f6fc1b17c973;hp=4c81e2e50e68b2b0f3b3ab33cc0221eaed608ece;hpb=48a4076f692ffe34026c37815580a32b2f70592b;p=libserialport.git

diff --git a/windows.c b/windows.c
index 4c81e2e..38ea0ce 100644
--- a/windows.c
+++ b/windows.c
@@ -331,7 +331,7 @@ static void get_usb_details(struct sp_port *port, DEVINST dev_inst_match)
 	return;
 }
 
-enum sp_return get_port_details(struct sp_port *port)
+SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 {
 	/* Description limited to 127 char,
 	   anything longer would not be user friendly anyway */
@@ -359,8 +359,10 @@ enum sp_return get_port_details(struct sp_port *port)
 			continue;
 		size = sizeof(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;
+		}
 		RegCloseKey(device_key);
 		value[sizeof(value)-1] = 0;
 		if (strcmp(value, port->name))
@@ -452,10 +454,12 @@ enum sp_return get_port_details(struct sp_port *port)
 		break;
 	}
 
+	SetupDiDestroyDeviceInfoList(device_info);
+
 	RETURN_OK();
 }
 
-enum sp_return list_ports(struct sp_port ***list)
+SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 {
 	HKEY key;
 	TCHAR *value, *data;
@@ -494,28 +498,30 @@ enum sp_return list_ports(struct sp_port ***list)
 		RegEnumValue(key, index, value, &value_len,
 			NULL, &type, (LPBYTE)data, &data_size) == ERROR_SUCCESS)
 	{
-		data_len = data_size / sizeof(TCHAR);
-		data[data_len] = '\0';
+		if (type == REG_SZ) {
+			data_len = data_size / sizeof(TCHAR);
+			data[data_len] = '\0';
 #ifdef UNICODE
-		name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL);
+			name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL);
 #else
-		name_len = data_len + 1;
+			name_len = data_len + 1;
 #endif
-		if (!(name = malloc(name_len))) {
-			SET_ERROR(ret, SP_ERR_MEM, "registry port name malloc failed");
-			goto out;
-		}
+			if (!(name = malloc(name_len))) {
+				SET_ERROR(ret, SP_ERR_MEM, "registry port name malloc failed");
+				goto out;
+			}
 #ifdef UNICODE
-		WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
+			WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
 #else
-		strcpy(name, data);
+			strcpy(name, data);
 #endif
-		if (type == REG_SZ) {
-			DEBUG("Found port %s", name);
+			DEBUG_FMT("Found port %s", name);
 			if (!(*list = list_append(*list, name))) {
 				SET_ERROR(ret, SP_ERR_MEM, "list append failed");
+				free(name);
 				goto out;
 			}
+			free(name);
 		}
 		index++;
 	}