secur32: GetComputerObjectName should not set domain part of the name if it is NULL.

LsaQueryInformationPolicy(PolicyDnsDomainInformation) sets both Name and DnsDomainName to NULL when hostname is set to a very long name like "this_is_host.part21.part32.local" and supposedly can't be resolved due to this. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

secur32: GetComputerObjectName should not set domain part of the name if it is NULL.
d7430abd · Dmitry Timoshkov · Alexandre Julliard · 034e88e0 · d7430abd
Commit d7430abd authored Mar 27, 2018 by Dmitry Timoshkov Committed by Alexandre Julliard Mar 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 12 deletions

secur32.c dlls/secur32/secur32.c +28 -12

No files found.
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -921,7 +921,9 @@ BOOLEAN WINAPI GetComputerObjectNameA(
    BOOLEAN rc;
    LPWSTR bufferW = NULL;
    ULONG sizeW = *nSize;
    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
    if (lpNameBuffer) {
        bufferW = heap_alloc(sizeW * sizeof(WCHAR));
        if (bufferW == NULL) {
@@ -952,6 +954,7 @@ BOOLEAN WINAPI GetComputerObjectNameW(
    PPOLICY_DNS_DOMAIN_INFO domainInfo;
    NTSTATUS ntStatus;
    BOOLEAN status;
    TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
    if (NameFormat == NameUnknown)
@@ -1000,8 +1003,13 @@ BOOLEAN WINAPI GetComputerObjectNameW(
                    {
                        WCHAR bs[] = { '\\', 0 };
                        WCHAR ds[] = { '$', 0 };
-                        lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer);
+                        if (domainInfo->Name.Buffer)
-                        lstrcatW(lpNameBuffer, bs);
+                        {
+                            lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer);
+                            lstrcatW(lpNameBuffer, bs);
+                        }
+                        else
+                            *lpNameBuffer = 0;
                        lstrcatW(lpNameBuffer, name);
                        lstrcatW(lpNameBuffer, ds);
                        status = TRUE;
@@ -1038,13 +1046,18 @@ BOOLEAN WINAPI GetComputerObjectNameW(
            }
            len = strlenW(cnW) + size + 1 + strlenW(ComputersW) + 1 + strlenW(dcW);
-            suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.');
+            if (domainInfo->DnsDomainName.Buffer)
-            if (suffix)
            {
-                *suffix++ = 0;
+                suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.');
-                len += 1 + strlenW(dcW) + strlenW(suffix);
+                if (suffix)
+                {
+                    *suffix++ = 0;
+                    len += 1 + strlenW(dcW) + strlenW(suffix);
+                }
+                len += strlenW(domainInfo->DnsDomainName.Buffer);
            }
-            len += strlenW(domainInfo->DnsDomainName.Buffer);
+            else
+                suffix = NULL;
            if (lpNameBuffer && *nSize > len)
            {
@@ -1052,14 +1065,17 @@ BOOLEAN WINAPI GetComputerObjectNameW(
                lstrcatW(lpNameBuffer, name);
                lstrcatW(lpNameBuffer, commaW);
                lstrcatW(lpNameBuffer, ComputersW);
-                lstrcatW(lpNameBuffer, commaW);
+                if (domainInfo->DnsDomainName.Buffer)
-                lstrcatW(lpNameBuffer, dcW);
-                lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer);
-                if (suffix)
                {
                    lstrcatW(lpNameBuffer, commaW);
                    lstrcatW(lpNameBuffer, dcW);
-                    lstrcatW(lpNameBuffer, suffix);
+                    lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer);
+                    if (suffix)
+                    {
+                        lstrcatW(lpNameBuffer, commaW);
+                        lstrcatW(lpNameBuffer, dcW);
+                        lstrcatW(lpNameBuffer, suffix);
+                    }
                }
                status = TRUE;
            }