From: Martin Ling <redacted>
Date: Sat, 28 Dec 2019 21:38:04 +0000 (+0100)
Subject: windows: wc_to_utf8: Eliminate variable-length array.
X-Git-Tag: libserialport-0.1.2~56
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a9900f8b6463c3c4f8b34853156e9d49eadf4556;p=libserialport.git

windows: wc_to_utf8: Eliminate variable-length array.

This should enable compatibility with MSVC.
---

diff --git a/windows.c b/windows.c
index 53c1b02..a951378 100644
--- a/windows.c
+++ b/windows.c
@@ -31,8 +31,12 @@ static void enumerate_hub(struct sp_port *port, const char *hub_name,
 static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
 {
 	ULONG wc_length = size / sizeof(WCHAR);
-	WCHAR wc_str[wc_length + 1];
-	char *utf8_str;
+	WCHAR *wc_str = NULL;
+	char *utf8_str = NULL;
+
+	/* Allocate aligned wide char buffer */
+	if (!(wc_str = malloc(size + sizeof(WCHAR))))
+		goto wc_to_utf8_end;
 
 	/* Zero-terminate the wide char string. */
 	memcpy(wc_str, wc_buffer, size);
@@ -41,19 +45,24 @@ static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
 	/* Compute the size of the UTF-8 converted string. */
 	if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
 	                                 NULL, 0, NULL, NULL)))
-		return NULL;
+		goto wc_to_utf8_end;
 
 	/* Allocate UTF-8 output buffer. */
 	if (!(utf8_str = malloc(size)))
-		return NULL;
+		goto wc_to_utf8_end;
 
 	/* Actually converted to UTF-8. */
 	if (!WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,
 	                         utf8_str, size, NULL, NULL)) {
 		free(utf8_str);
-		return NULL;
+		utf8_str = NULL;
+		goto wc_to_utf8_end;
 	}
 
+wc_to_utf8_end:
+	if (wc_str)
+		free(wc_str);
+
 	return utf8_str;
 }