From: Uwe Hermann <redacted>
Date: Sat, 28 Dec 2019 16:08:49 +0000 (+0100)
Subject: windows: Fix incorrect wc_to_utf8() calls.
X-Git-Tag: libserialport-0.1.2~91
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2e0437c28e272ff6c64c58d9b032986979289fae;p=libserialport.git

windows: Fix incorrect wc_to_utf8() calls.

This fixes bug #1079.
---

diff --git a/windows.c b/windows.c
index 360da73..72ce307 100644
--- a/windows.c
+++ b/windows.c
@@ -82,7 +82,7 @@ static char *get_root_hub_name(HANDLE host_controller)
 	}
 
 	/* Convert the root hub name string to UTF-8. */
-	root_hub_name_utf8 = wc_to_utf8(root_hub_name_wc->RootHubName, size);
+	root_hub_name_utf8 = wc_to_utf8(root_hub_name_wc->RootHubName, size - offsetof(USB_ROOT_HUB_NAME, RootHubName));
 	free(root_hub_name_wc);
 	return root_hub_name_utf8;
 }
@@ -117,7 +117,7 @@ static char *get_external_hub_name(HANDLE hub, ULONG connection_index)
 	}
 
 	/* Convert the external hub name string to UTF-8. */
-	ext_hub_name_utf8 = wc_to_utf8(ext_hub_name_wc->NodeName, size);
+	ext_hub_name_utf8 = wc_to_utf8(ext_hub_name_wc->NodeName, size - offsetof(USB_NODE_CONNECTION_NAME, NodeName));
 	free(ext_hub_name_wc);
 	return ext_hub_name_utf8;
 }
@@ -146,7 +146,7 @@ static char *get_string_descriptor(HANDLE hub_device, ULONG connection_index,
 	    || desc->bLength % 2)
 		return NULL;
 
-	return wc_to_utf8(desc->bString, desc->bLength);
+	return wc_to_utf8(desc->bString, desc->bLength - offsetof(USB_STRING_DESCRIPTOR, bString));
 }
 
 static void enumerate_hub_ports(struct sp_port *port, HANDLE hub_device,