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

advapi32: Set output type earlier in CredUnmarshalCredential.

Browse Source
This commit is contained in:
Thomas Faber 2014-03-29 10:18:22 +01:00 committed by Alexandre Julliard
parent 27c8e9013f
commit 309b5366e8
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/advapi32/cred.c
View File

@ -2068,13 +2068,15 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO
TRACE("%s, %p, %p\n", debugstr_w(cred), type, out);
if (!cred || cred[0] != '@' || cred[1] != '@' || !cred[2] || !cred[3])
if (!cred || cred[0] != '@' || cred[1] != '@' ||
char_decode( cred[2] ) > 63)
{
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
len = strlenW( cred + 3 );
switch (cred[2] - 'A')
*type = char_decode( cred[2] );
switch (*type)
{
case CertCredential:
{
@ -2089,7 +2091,6 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO
if (!(cert = HeapAlloc( GetProcessHeap(), 0, sizeof(*cert) ))) return FALSE;
memcpy( cert->rgbHashOfCert, hash, sizeof(cert->rgbHashOfCert) );
cert->cbSize = sizeof(*cert);
*type = CertCredential;
*out = cert;
break;
}
@ -2113,7 +2114,6 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO
}
target->UserName = (WCHAR *)(target + 1);
target->UserName[size / sizeof(WCHAR)] = 0;
*type = UsernameTargetCredential;
*out = target;
break;
}
@ -2121,7 +2121,8 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO
FIXME("BinaryBlobCredential not implemented\n");
return FALSE;
default:
WARN("unhandled type %u\n", cred[2] - 'A');
WARN("unhandled type %u\n", *type);
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
return TRUE;

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

@ -580,9 +580,25 @@ static void test_CredUnmarshalCredentialA(void)
CRED_MARSHAL_TYPE type;
const void *unmarshaled;
} tests[] = {
{ "", 0, NULL },
{ "@", 0, NULL },
{ "@@", 0, NULL },
{ "@@@", 0, NULL },
{ "@@A", 0, NULL },
{ "@@E", 4, NULL },
{ "@@Z", 25, NULL },
{ "@@a", 26, NULL },
{ "@@0", 52, NULL },
{ "@@#", 62, NULL },
{ "@@-", 63, NULL },
{ "@@B", CertCredential, NULL },
{ "@@BA", CertCredential, NULL },
{ "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty },
{ "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine },
{ "@@C", UsernameTargetCredential, NULL },
{ "@@CA", UsernameTargetCredential, NULL },
{ "@@CAAAAAA", UsernameTargetCredential, NULL },
{ "@@CAAAAAA0B", UsernameTargetCredential, NULL },
{ "@@CAAAAAA0BA", UsernameTargetCredential, NULL },
{ "@@CCAAAAA0BA", UsernameTargetCredential, tW },
{ "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW },
@ -610,14 +626,6 @@ static void test_CredUnmarshalCredentialA(void)
ok( !ret, "unexpected success\n" );
ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error );
type = 0;
cert = NULL;
SetLastError( 0xdeadbeef );
ret = pCredUnmarshalCredentialA( "", &type, (void **)&cert );
error = GetLastError();
ok( !ret, "unexpected success\n" );
ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error );
if (0) { /* crash */
SetLastError( 0xdeadbeef );
ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, NULL );
@ -665,7 +673,7 @@ static void test_CredUnmarshalCredentialA(void)
{
ok(!ret, "[%u] unexpected success\n", i);
ok(error == ERROR_INVALID_PARAMETER, "[%u] got %u\n", i, error);
todo_wine ok(type == tests[i].type, "[%u] got %u\n", i, type);
ok(type == tests[i].type, "[%u] got %u\n", i, type);
ok(p == NULL, "[%u] returned pointer is not NULL\n", i);
}