Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup excessive memory allocation check

Browse Source 
Operator new throws rather than returns NULL.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2022-10-14 14:00:16 +02:00
parent a052c028b5
commit 95fb94d828
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/WinStd/Win.h
View File

@ -1281,19 +1281,11 @@ static _Success_(return != 0) BOOL GetTokenInformation(_In_ HANDLE TokenHandle,
if (GetTokenInformation(TokenHandle, TokenInformationClass, szStackBuffer, sizeof(szStackBuffer), &dwSize)) { if (GetTokenInformation(TokenHandle, TokenInformationClass, szStackBuffer, sizeof(szStackBuffer), &dwSize)) {
// The stack buffer was big enough to retrieve complete data. Alloc and copy. // The stack buffer was big enough to retrieve complete data. Alloc and copy.
TokenInformation.reset((_Ty*)(new BYTE[dwSize / sizeof(BYTE)])); TokenInformation.reset((_Ty*)(new BYTE[dwSize / sizeof(BYTE)]));
if (!TokenInformation) {
SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
memcpy(TokenInformation.get(), szStackBuffer, dwSize); memcpy(TokenInformation.get(), szStackBuffer, dwSize);
return TRUE; return TRUE;
} else if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { } else if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
// The stack buffer was too small to retrieve complete data. Alloc and retry. // The stack buffer was too small to retrieve complete data. Alloc and retry.
TokenInformation.reset((_Ty*)(new BYTE[dwSize / sizeof(BYTE)])); TokenInformation.reset((_Ty*)(new BYTE[dwSize / sizeof(BYTE)]));
if (!TokenInformation) {
SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
return GetTokenInformation(TokenHandle, TokenInformationClass, TokenInformation.get(), dwSize, &dwSize); return GetTokenInformation(TokenHandle, TokenInformationClass, TokenInformation.get(), dwSize, &dwSize);
} else } else
return FALSE; return FALSE;