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

crypt32: Don't crash when setting CRYPT_KEY_PROV_INFO with empty names.

This commit is contained in:
Juan Lang 2006-10-04 18:13:49 -07:00 committed by Alexandre Julliard
parent 836cf139bb
commit 190f9d6546
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/crypt32/cert.c
View File

@ -367,12 +367,22 @@ static void CRYPT_CopyKeyProvInfo(PCRYPT_KEY_PROV_INFO to,
DWORD i; DWORD i;
LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO);
to->pwszContainerName = (LPWSTR)nextData; if (from->pwszContainerName)
lstrcpyW(to->pwszContainerName, from->pwszContainerName); {
nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); to->pwszContainerName = (LPWSTR)nextData;
to->pwszProvName = (LPWSTR)nextData; lstrcpyW(to->pwszContainerName, from->pwszContainerName);
lstrcpyW(to->pwszProvName, from->pwszProvName); nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR);
nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); }
else
to->pwszContainerName = NULL;
if (from->pwszProvName)
{
to->pwszProvName = (LPWSTR)nextData;
lstrcpyW(to->pwszProvName, from->pwszProvName);
nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR);
}
else
to->pwszProvName = NULL;
to->dwProvType = from->dwProvType; to->dwProvType = from->dwProvType;
to->dwFlags = from->dwFlags; to->dwFlags = from->dwFlags;
to->cProvParam = from->cProvParam; to->cProvParam = from->cProvParam;
@ -397,8 +407,14 @@ static BOOL CertContext_SetKeyProvInfoProperty(PCONTEXT_PROPERTY_LIST properties
LPBYTE buf = NULL; LPBYTE buf = NULL;
DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize; DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize;
containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); if (info->pwszContainerName)
provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR);
else
containerSize = 0;
if (info->pwszProvName)
provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR);
else
provNameSize = 0;
size += containerSize + provNameSize; size += containerSize + provNameSize;
for (i = 0; i < info->cProvParam; i++) for (i = 0; i < info->cProvParam; i++)
size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData;