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

msi: Fix a memory leak (valgrind).

This commit is contained in:
Hans Leidekker 2011-04-14 14:40:15 +02:00 committed by Alexandre Julliard
parent 846811be59
commit 741b0f37f8
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/msi/msi.c
View File

@ -2395,25 +2395,36 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCER
data.dwProvFlags = 0;
data.dwUIContext = WTD_UICONTEXT_INSTALL;
hr = WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data );
if (FAILED(hr)) return hr;
if (FAILED(hr)) goto done;
signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 );
if (!signer) return TRUST_E_NOSIGNATURE;
if (!(signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 )))
{
hr = TRUST_E_NOSIGNATURE;
goto done;
}
if (hash)
{
DWORD len = signer->psSigner->EncryptedHash.cbData;
if (*hashlen < len)
{
*hashlen = len;
return HRESULT_FROM_WIN32(ERROR_MORE_DATA);
hr = HRESULT_FROM_WIN32(ERROR_MORE_DATA);
goto done;
}
memcpy( hash, signer->psSigner->EncryptedHash.pbData, len );
*hashlen = len;
}
provider = WTHelperGetProvCertFromChain( signer, 0 );
if (!provider) return TRUST_E_PROVIDER_UNKNOWN;
if (!(provider = WTHelperGetProvCertFromChain( signer, 0 )))
{
hr = TRUST_E_PROVIDER_UNKNOWN;
goto done;
}
*cert = CertDuplicateCertificateContext( provider->pCert );
return S_OK;
done:
data.dwStateAction = WTD_STATEACTION_CLOSE;
WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data );
return hr;
}
/******************************************************************