From b698041d9fbd8da0b6e6b313458c4bcfa783cff2 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 25 Jan 2022 13:22:36 +0100 Subject: [PATCH] Fixed return value of GetUserNameExA --- winpr/libwinpr/sspicli/sspicli.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/winpr/libwinpr/sspicli/sspicli.c b/winpr/libwinpr/sspicli/sspicli.c index 97eb3fb63..1d491b874 100644 --- a/winpr/libwinpr/sspicli/sspicli.c +++ b/winpr/libwinpr/sspicli/sspicli.c @@ -207,6 +207,9 @@ BOOL LogonUserExW(LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword BOOL GetUserNameExA(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) { + WINPR_ASSERT(lpNameBuffer); + WINPR_ASSERT(nSize); + switch (NameFormat) { case NameSamCompatible: @@ -229,9 +232,8 @@ BOOL GetUserNameExA(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG #else strncpy(lpNameBuffer, getlogin(), *nSize); #endif - if (*nSize > 1) - *nSize = strnlen(lpNameBuffer, *nSize - 1) + 1; - break; + *nSize = strnlen(lpNameBuffer, *nSize); + return TRUE; case NameFullyQualifiedDN: case NameDisplay: