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

cryptnet: Use RTL_SIZEOF_THROUGH_FIELD. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-07-15 11:25:18 -05:00 committed by Alexandre Julliard
parent bdcddf024f
commit d12ca0dd84
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/cryptnet/cryptnet_main.c
View File

@ -521,13 +521,13 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject,
{ {
if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) if ((ret = CRYPT_GetObjectFromFile(hFile, pObject)))
{ {
if (pAuxInfo && pAuxInfo->cbSize >= if (pAuxInfo && pAuxInfo->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CRYPT_RETRIEVE_AUX_INFO, pLastSyncTime)
offsetof(CRYPT_RETRIEVE_AUX_INFO, && pAuxInfo->pLastSyncTime)
pLastSyncTime) + sizeof(PFILETIME) && {
pAuxInfo->pLastSyncTime)
memcpy(pAuxInfo->pLastSyncTime, memcpy(pAuxInfo->pLastSyncTime,
&pCacheInfo->LastSyncTime, &pCacheInfo->LastSyncTime,
sizeof(FILETIME)); sizeof(FILETIME));
}
} }
CloseHandle(hFile); CloseHandle(hFile);
} }
@ -1028,12 +1028,12 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL,
{ {
if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) if ((ret = CRYPT_GetObjectFromFile(hFile, pObject)))
{ {
if (pAuxInfo && pAuxInfo->cbSize >= if (pAuxInfo && pAuxInfo->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CRYPT_RETRIEVE_AUX_INFO, pLastSyncTime)
offsetof(CRYPT_RETRIEVE_AUX_INFO, && pAuxInfo->pLastSyncTime)
pLastSyncTime) + sizeof(PFILETIME) && {
pAuxInfo->pLastSyncTime)
GetFileTime(hFile, NULL, NULL, GetFileTime(hFile, NULL, NULL,
pAuxInfo->pLastSyncTime); pAuxInfo->pLastSyncTime);
}
} }
CloseHandle(hFile); CloseHandle(hFile);
} }
@ -1557,9 +1557,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext(
&cbUrlArray, NULL, NULL); &cbUrlArray, NULL, NULL);
if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION)
retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL;
if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && pRevPara
pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout))
dwUrlRetrievalTimeout) + sizeof(DWORD))
{ {
startTime = GetTickCount(); startTime = GetTickCount();
endTime = startTime + pRevPara->dwUrlRetrievalTimeout; endTime = startTime + pRevPara->dwUrlRetrievalTimeout;