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

wintrust: Record full catalog filename in catalog info structure, not just the basename.

Browse Source
This commit is contained in:
Hans Leidekker 2008-12-22 14:19:14 +01:00 committed by Alexandre Julliard
parent 5a25ffe435
commit 21d5f4a617
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wintrust/crypt.c
View File

@ -134,19 +134,19 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
{ {
FIXME("NULL basename not handled\n"); FIXME("NULL basename not handled\n");
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return NULL;
} }
if (!ca || ca->magic != CATADMIN_MAGIC || !catalogFile || flags) if (!ca || ca->magic != CATADMIN_MAGIC || !catalogFile || flags)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return FALSE; return NULL;
} }
len = strlenW(ca->path) + strlenW(selectBaseName) + 2; len = strlenW(ca->path) + strlenW(selectBaseName) + 2;
if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
{ {
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
return FALSE; return NULL;
} }
strcpyW(target, ca->path); strcpyW(target, ca->path);
strcatW(target, slashW); strcatW(target, slashW);
@ -161,10 +161,10 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
{ {
HeapFree(GetProcessHeap(), 0, target); HeapFree(GetProcessHeap(), 0, target);
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
return FALSE; return NULL;
} }
ci->magic = CATINFO_MAGIC; ci->magic = CATINFO_MAGIC;
strcpyW(ci->file, selectBaseName); strcpyW(ci->file, target);
HeapFree(GetProcessHeap(), 0, target); HeapFree(GetProcessHeap(), 0, target);
return ci; return ci;