ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netapi32: Return an empty comment instead of NULL pointer in NetServerGetInfo.

Browse Source
This commit is contained in:
Bruno Jesus 2015-03-21 01:18:40 -03:00 committed by Alexandre Julliard
parent 1fa2986d00
commit ea2507f461
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/netapi32/netapi32.c
View File

@ -1042,7 +1042,8 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu
GetComputerNameW(computerName, &computerNameLen); GetComputerNameW(computerName, &computerNameLen);
computerNameLen++; /* include NULL terminator */ computerNameLen++; /* include NULL terminator */
size = sizeof(SERVER_INFO_101) + computerNameLen * sizeof(WCHAR); /* Plus 1 for empty comment */
size = sizeof(SERVER_INFO_101) + (computerNameLen + 1) * sizeof(WCHAR);
ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); ret = NetApiBufferAllocate(size, (LPVOID *)bufptr);
if (ret == NERR_Success) if (ret == NERR_Success)
{ {
@ -1060,7 +1061,9 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu
info->sv101_version_minor = verInfo.dwMinorVersion; info->sv101_version_minor = verInfo.dwMinorVersion;
/* Use generic type as no wine equivalent of DC / Server */ /* Use generic type as no wine equivalent of DC / Server */
info->sv101_type = SV_TYPE_NT; info->sv101_type = SV_TYPE_NT;
info->sv101_comment = NULL; info->sv101_comment = (LMSTR)(*bufptr + sizeof(SERVER_INFO_101)
+ computerNameLen * sizeof(WCHAR));
info->sv101_comment[0] = '\0';
} }
break; break;
} }