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

advapi32: Fix uneven length handling in CredUnmarshalCredential.

This commit is contained in:
Thomas Faber 2014-03-28 10:21:06 +01:00 committed by Alexandre Julliard
parent 309b5366e8
commit 6754c35589
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advapi32/cred.c
View File

@ -2100,7 +2100,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO
DWORD size; DWORD size;
if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) ||
!size || size % sizeof(WCHAR) || size > INT_MAX) size % sizeof(WCHAR) || len - 6 != (size * 4 + 2) / 3)
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return FALSE; return FALSE;

18
dlls/advapi32/tests/cred.c
View File

@ -566,6 +566,8 @@ static void test_CredUnmarshalCredentialA(void)
static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0}; static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0};
static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0}; static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0};
static const WCHAR tW[] = {'t',0}; static const WCHAR tW[] = {'t',0};
static const WCHAR teW[] = {'t','e',0};
static const WCHAR tesW[] = {'t','e','s',0};
static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR testW[] = {'t','e','s','t',0};
void *p; void *p;
CERT_CREDENTIAL_INFO *cert; CERT_CREDENTIAL_INFO *cert;
@ -593,6 +595,8 @@ static void test_CredUnmarshalCredentialA(void)
{ "@@-", 63, NULL }, { "@@-", 63, NULL },
{ "@@B", CertCredential, NULL }, { "@@B", CertCredential, NULL },
{ "@@BA", CertCredential, NULL }, { "@@BA", CertCredential, NULL },
{ "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL },
{ "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL },
{ "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty },
{ "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine },
{ "@@C", UsernameTargetCredential, NULL }, { "@@C", UsernameTargetCredential, NULL },
@ -601,6 +605,20 @@ static void test_CredUnmarshalCredentialA(void)
{ "@@CAAAAAA0B", UsernameTargetCredential, NULL }, { "@@CAAAAAA0B", UsernameTargetCredential, NULL },
{ "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, { "@@CAAAAAA0BA", UsernameTargetCredential, NULL },
{ "@@CCAAAAA0BA", UsernameTargetCredential, tW }, { "@@CCAAAAA0BA", UsernameTargetCredential, tW },
{ "@@CEAAAAA0BA", UsernameTargetCredential, NULL },
{ "@@CEAAAAA0BAd", UsernameTargetCredential, NULL },
{ "@@CEAAAAA0BAdA", UsernameTargetCredential, NULL },
{ "@@CEAAAAA0BQZAA", UsernameTargetCredential, teW },
{ "@@CEAAAAA0BQZAQ", UsernameTargetCredential, teW },
{ "@@CEAAAAA0BQZAg", UsernameTargetCredential, teW },
{ "@@CEAAAAA0BQZAw", UsernameTargetCredential, teW },
{ "@@CEAAAAA0BQZAAA", UsernameTargetCredential, NULL },
{ "@@CGAAAAA0BQZAMH", UsernameTargetCredential, NULL },
{ "@@CGAAAAA0BQZAMHA", UsernameTargetCredential, tesW },
{ "@@CGAAAAA0BQZAMHAA", UsernameTargetCredential, NULL },
{ "@@CCAAAAA0BAA", UsernameTargetCredential, NULL },
{ "@@CBAAAAA0BAA", UsernameTargetCredential, NULL },
{ "@@CAgAAAA0BAA", UsernameTargetCredential, NULL },
{ "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW },
{ "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL }, { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL },
}; };