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: wc_to_utf8(): Fix a WCHAR related issue causing crashes.

Browse Source 
In wc_to_utf8() in windows.c, the zero terminator is written to an invalid
array index, which results in 2 bytes being zeroed in a random place in the
stack. This sometimes causes a crash when running sp_list_ports() (depending
on string length and compiler optimisation settings).

sizeof(wc_str) returns the size in bytes, so cannot be used directly as an
index into that array, it should be divided by sizeof(WCHAR). Otherwise the
zero terminator index is approximately twice what it should be.

This fixes bug #1031.
This commit is contained in:
Martin Jackson 2017-09-10 00:37:48 +02:00 committed by Uwe Hermann
parent a84ffb5372
commit 38b71192dd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
windows.c
View File

@ -30,12 +30,13 @@ static void enumerate_hub(struct sp_port *port, const char *hub_name,
static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size) static char *wc_to_utf8(PWCHAR wc_buffer, ULONG size)
{ {
WCHAR wc_str[(size / sizeof(WCHAR)) + 1]; ULONG wc_length = size / sizeof(WCHAR);
WCHAR wc_str[wc_length + 1];
char *utf8_str; char *utf8_str;
/* Zero-terminate the wide char string. */ /* Zero-terminate the wide char string. */
memcpy(wc_str, wc_buffer, size); memcpy(wc_str, wc_buffer, size);
wc_str[sizeof(wc_str) - 1] = 0; wc_str[wc_length] = 0;
/* Compute the size of the UTF-8 converted string. */ /* Compute the size of the UTF-8 converted string. */
if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1, if (!(size = WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wc_str, -1,