Skip to content

W
wine-winehq
Commit bbd71d6b authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

kernel32: Fix out of bounds access in DnsHostnameToComputerName[AW].

parent 2ef27a23
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/kernel32/computername.c
View file @ bbd71d6b
...@@ -688,7 +688,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, ...@@ -688,7 +688,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname,
if (len > MAX_COMPUTERNAME_LENGTH) if (len > MAX_COMPUTERNAME_LENGTH)
len = MAX_COMPUTERNAME_LENGTH; len = MAX_COMPUTERNAME_LENGTH;
if (*size < len) if (*size < len + 1)
{ {
*size = len; *size = len;
return FALSE; return FALSE;
...@@ -696,7 +696,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, ...@@ -696,7 +696,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname,
if (!computername) return FALSE; if (!computername) return FALSE;
memcpy( computername, hostname, len ); memcpy( computername, hostname, len );
computername[len + 1] = 0; computername[len] = 0;
return TRUE; return TRUE;
} }
...@@ -716,7 +716,7 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname, ...@@ -716,7 +716,7 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname,
if (len > MAX_COMPUTERNAME_LENGTH) if (len > MAX_COMPUTERNAME_LENGTH)
len = MAX_COMPUTERNAME_LENGTH; len = MAX_COMPUTERNAME_LENGTH;
if (*size < len) if (*size < len + 1)
{ {
*size = len; *size = len;
return FALSE; return FALSE;
...@@ -724,6 +724,6 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname, ...@@ -724,6 +724,6 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname,
if (!computername) return FALSE; if (!computername) return FALSE;
memcpy( computername, hostname, len * sizeof(WCHAR) ); memcpy( computername, hostname, len * sizeof(WCHAR) );
computername[len + 1] = 0; computername[len] = 0;
return TRUE; return TRUE;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment