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

bbd71d6b · André Hentschel · Alexandre Julliard · 2ef27a23 · bbd71d6b
Commit bbd71d6b authored Jan 29, 2014 by André Hentschel Committed by Alexandre Julliard Jan 30, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

computername.c dlls/kernel32/computername.c +4 -4

No files found.
--- a/dlls/kernel32/computername.c
+++ b/dlls/kernel32/computername.c
@@ -688,7 +688,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname,
    if (len > MAX_COMPUTERNAME_LENGTH)
        len = MAX_COMPUTERNAME_LENGTH;

-    if (*size < len)
+    if (*size < len + 1)
    {
        *size = len;
        return FALSE;
@@ -696,7 +696,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname,
    if (!computername) return FALSE;

    memcpy( computername, hostname, len );
-    computername[len + 1] = 0;
+    computername[len] = 0;
    return TRUE;
 }

@@ -716,7 +716,7 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname,
    if (len > MAX_COMPUTERNAME_LENGTH)
        len = MAX_COMPUTERNAME_LENGTH;

-    if (*size < len)
+    if (*size < len + 1)
    {
        *size = len;
        return FALSE;
@@ -724,6 +724,6 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname,
    if (!computername) return FALSE;

    memcpy( computername, hostname, len * sizeof(WCHAR) );
-    computername[len + 1] = 0;
+    computername[len] = 0;
    return TRUE;
 }