Skip to content

W
wine-cw
Commit 224d33b2 authored by Detlef Riekenberg's avatar Detlef Riekenberg Committed by Alexandre Julliard
Browse files
Options

advapi32: Don't use -1 as dstlen in WideCharToMultiByte.

parent 2f112cf5
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 35 deletions
dlls/advapi32/cred.c
View file @ 224d33b2
...@@ -918,52 +918,70 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) ...@@ -918,52 +918,70 @@ static DWORD mac_delete_credential(LPCWSTR TargetName)
} }
#endif #endif
static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD *len) /******************************************************************************
* convert_PCREDENTIALW_to_PCREDENTIALA [internal]
*
* convert a Credential struct from UNICODE to ANSI and return the needed size in Bytes
*
*/
static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len)
{ {
char *buffer = (char *)CredentialA + sizeof(CREDENTIALA); char *buffer;
INT string_len; INT string_len;
INT needed = sizeof(CREDENTIALA);
*len += sizeof(CREDENTIALA);
if (!CredentialA) if (!CredentialA)
{ {
if (CredentialW->TargetName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); if (CredentialW->TargetName)
if (CredentialW->Comment) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL);
*len += CredentialW->CredentialBlobSize; if (CredentialW->Comment)
if (CredentialW->TargetAlias) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL);
if (CredentialW->UserName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); needed += CredentialW->CredentialBlobSize;
if (CredentialW->TargetAlias)
needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL);
if (CredentialW->UserName)
needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL);
return; return needed;
} }
buffer = (char *)CredentialA + sizeof(CREDENTIALA);
len -= sizeof(CREDENTIALA);
CredentialA->Flags = CredentialW->Flags; CredentialA->Flags = CredentialW->Flags;
CredentialA->Type = CredentialW->Type; CredentialA->Type = CredentialW->Type;
if (CredentialW->TargetName) if (CredentialW->TargetName)
{ {
CredentialA->TargetName = buffer; CredentialA->TargetName = buffer;
string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, CredentialA->TargetName, -1, NULL, NULL); string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, buffer, len, NULL, NULL);
buffer += string_len; buffer += string_len;
*len += string_len; needed += string_len;
len -= string_len;
} }
else else
CredentialA->TargetName = NULL; CredentialA->TargetName = NULL;
if (CredentialW->Comment) if (CredentialW->Comment)
{ {
CredentialA->Comment = buffer; CredentialA->Comment = buffer;
string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, CredentialA->Comment, -1, NULL, NULL); string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, buffer, len, NULL, NULL);
buffer += string_len; buffer += string_len;
*len += string_len; needed += string_len;
len -= string_len;
} }
else else
CredentialA->Comment = NULL; CredentialA->Comment = NULL;
CredentialA->LastWritten = CredentialW->LastWritten; CredentialA->LastWritten = CredentialW->LastWritten;
CredentialA->CredentialBlobSize = CredentialW->CredentialBlobSize; CredentialA->CredentialBlobSize = CredentialW->CredentialBlobSize;
if (CredentialW->CredentialBlobSize) if (CredentialW->CredentialBlobSize && (CredentialW->CredentialBlobSize <= len))
{ {
CredentialA->CredentialBlob =(LPBYTE)buffer; CredentialA->CredentialBlob =(LPBYTE)buffer;
memcpy(CredentialA->CredentialBlob, CredentialW->CredentialBlob, memcpy(CredentialA->CredentialBlob, CredentialW->CredentialBlob,
CredentialW->CredentialBlobSize); CredentialW->CredentialBlobSize);
buffer += CredentialW->CredentialBlobSize; buffer += CredentialW->CredentialBlobSize;
*len += CredentialW->CredentialBlobSize; needed += CredentialW->CredentialBlobSize;
len -= CredentialW->CredentialBlobSize;
} }
else else
CredentialA->CredentialBlob = NULL; CredentialA->CredentialBlob = NULL;
...@@ -973,21 +991,23 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, ...@@ -973,21 +991,23 @@ static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW,
if (CredentialW->TargetAlias) if (CredentialW->TargetAlias)
{ {
CredentialA->TargetAlias = buffer; CredentialA->TargetAlias = buffer;
string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, CredentialA->TargetAlias, -1, NULL, NULL); string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, buffer, len, NULL, NULL);
buffer += string_len; buffer += string_len;
*len += string_len; needed += string_len;
len -= string_len;
} }
else else
CredentialA->TargetAlias = NULL; CredentialA->TargetAlias = NULL;
if (CredentialW->UserName) if (CredentialW->UserName)
{ {
CredentialA->UserName = buffer; CredentialA->UserName = buffer;
string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, CredentialA->UserName, -1, NULL, NULL); string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, buffer, len, NULL, NULL);
buffer += string_len; needed += string_len;
*len += string_len;
} }
else else
CredentialA->UserName = NULL; CredentialA->UserName = NULL;
return needed;
} }
static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, DWORD *len) static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, DWORD *len)
...@@ -1165,7 +1185,8 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, ...@@ -1165,7 +1185,8 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count,
LPWSTR FilterW; LPWSTR FilterW;
PCREDENTIALW *CredentialsW; PCREDENTIALW *CredentialsW;
DWORD i; DWORD i;
DWORD len; INT len;
INT needed;
char *buffer; char *buffer;
TRACE("(%s, 0x%x, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials); TRACE("(%s, 0x%x, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials);
...@@ -1193,7 +1214,7 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, ...@@ -1193,7 +1214,7 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count,
len = *Count * sizeof(PCREDENTIALA); len = *Count * sizeof(PCREDENTIALA);
for (i = 0; i < *Count; i++) for (i = 0; i < *Count; i++)
convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0);
*Credentials = HeapAlloc(GetProcessHeap(), 0, len); *Credentials = HeapAlloc(GetProcessHeap(), 0, len);
if (!*Credentials) if (!*Credentials)
...@@ -1204,12 +1225,13 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count, ...@@ -1204,12 +1225,13 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count,
} }
buffer = (char *)&(*Credentials)[*Count]; buffer = (char *)&(*Credentials)[*Count];
len -= *Count * sizeof(PCREDENTIALA);
for (i = 0; i < *Count; i++) for (i = 0; i < *Count; i++)
{ {
len = 0;
(*Credentials)[i] = (PCREDENTIALA)buffer; (*Credentials)[i] = (PCREDENTIALA)buffer;
convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len);
buffer += len; buffer += needed;
len -= needed;
} }
CredFree(CredentialsW); CredFree(CredentialsW);
...@@ -1338,7 +1360,7 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA * ...@@ -1338,7 +1360,7 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA *
{ {
LPWSTR TargetNameW; LPWSTR TargetNameW;
PCREDENTIALW CredentialW; PCREDENTIALW CredentialW;
DWORD len; INT len;
TRACE("(%s, %d, 0x%x, %p)\n", debugstr_a(TargetName), Type, Flags, Credential); TRACE("(%s, %d, 0x%x, %p)\n", debugstr_a(TargetName), Type, Flags, Credential);
...@@ -1364,16 +1386,14 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA * ...@@ -1364,16 +1386,14 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA *
} }
HeapFree(GetProcessHeap(), 0, TargetNameW); HeapFree(GetProcessHeap(), 0, TargetNameW);
len = 0; len = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, 0);
convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, &len);
*Credential = HeapAlloc(GetProcessHeap(), 0, len); *Credential = HeapAlloc(GetProcessHeap(), 0, len);
if (!*Credential) if (!*Credential)
{ {
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
return FALSE; return FALSE;
} }
len = 0; convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, len);
convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, &len);
CredFree(CredentialW); CredFree(CredentialW);
...@@ -1545,7 +1565,7 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf ...@@ -1545,7 +1565,7 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf
DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials)
{ {
PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW;
DWORD len, i; INT len, i;
WCHAR *buffer, *end; WCHAR *buffer, *end;
BOOL ret; BOOL ret;
PCREDENTIALW* CredentialsW; PCREDENTIALW* CredentialsW;
...@@ -1654,10 +1674,11 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf ...@@ -1654,10 +1674,11 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf
if (ret) if (ret)
{ {
char *buf; char *buf;
INT needed;
len = *Size * sizeof(PCREDENTIALA); len = *Size * sizeof(PCREDENTIALA);
for (i = 0; i < *Size; i++) for (i = 0; i < *Size; i++)
convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0);
*Credentials = HeapAlloc(GetProcessHeap(), 0, len); *Credentials = HeapAlloc(GetProcessHeap(), 0, len);
if (!*Credentials) if (!*Credentials)
...@@ -1668,12 +1689,13 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf ...@@ -1668,12 +1689,13 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf
} }
buf = (char *)&(*Credentials)[*Size]; buf = (char *)&(*Credentials)[*Size];
len -= *Size * sizeof(PCREDENTIALA);
for (i = 0; i < *Size; i++) for (i = 0; i < *Size; i++)
{ {
len = 0;
(*Credentials)[i] = (PCREDENTIALA)buf; (*Credentials)[i] = (PCREDENTIALA)buf;
convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len);
buf += len; buf += needed;
len -= needed;
} }
CredFree(CredentialsW); CredFree(CredentialsW);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment