mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed strlen from GetComputerNameExA

This commit is contained in:
Armin Novak 2019-10-29 11:33:27 +01:00
parent 68f519ed6c
commit 142db87970
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winpr/libwinpr/sysinfo/sysinfo.c
View File

@ -424,7 +424,7 @@ BOOL GetComputerNameA(LPSTR lpBuffer, LPDWORD lpnSize)
BOOL GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, LPSTR lpBuffer, LPDWORD lpnSize) BOOL GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, LPSTR lpBuffer, LPDWORD lpnSize)
{ {
int length; size_t length;
char hostname[256]; char hostname[256];
if (!lpnSize) if (!lpnSize)
@ -449,7 +449,7 @@ BOOL GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, LPSTR lpBuffer, LPDWORD l
if (gethostname(hostname, sizeof(hostname)) == -1) if (gethostname(hostname, sizeof(hostname)) == -1)
return FALSE; return FALSE;
length = (int) strlen(hostname); length = strnlen(hostname, sizeof(hostname));
switch (NameType) switch (NameType)
{ {
@ -461,14 +461,14 @@ BOOL GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, LPSTR lpBuffer, LPDWORD l
case ComputerNamePhysicalDnsFullyQualified: case ComputerNamePhysicalDnsFullyQualified:
if ((*lpnSize <= (DWORD) length) || !lpBuffer) if ((*lpnSize <= (DWORD) length) || !lpBuffer)
{ {
*lpnSize = length + 1; *lpnSize = (DWORD)(length + 1);
SetLastError(ERROR_MORE_DATA); SetLastError(ERROR_MORE_DATA);
return FALSE; return FALSE;
} }
CopyMemory(lpBuffer, hostname, length); CopyMemory(lpBuffer, hostname, length);
lpBuffer[length] = '\0'; lpBuffer[length] = '\0';
*lpnSize = length; *lpnSize = (DWORD)length;
break; break;
default: default: