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

advapi32: Remove redundant NULL checks before CRYPT_Free.

This commit is contained in:
James Hawkins 2006-11-29 20:50:58 -08:00 committed by Alexandre Julliard
parent a64945baea
commit 024237efaa
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/advapi32/crypt.c
View File

@ -474,22 +474,15 @@ error:
pProv->dwMagic = 0; pProv->dwMagic = 0;
if (pProv->hModule) if (pProv->hModule)
FreeLibrary(pProv->hModule); FreeLibrary(pProv->hModule);
if (pProv->pVTable) CRYPT_Free(pProv->pVTable);
CRYPT_Free(pProv->pVTable); CRYPT_Free(pProv->pFuncs);
if (pProv->pFuncs)
CRYPT_Free(pProv->pFuncs);
CRYPT_Free(pProv); CRYPT_Free(pProv);
} }
if (pszContainerA) CRYPT_Free(pszContainerA);
CRYPT_Free(pszContainerA); CRYPT_Free(provnameA);
if (provnameA) CRYPT_Free(provname);
CRYPT_Free(provnameA); CRYPT_Free(temp);
if (provname) CRYPT_Free(imagepath);
CRYPT_Free(provname);
if (temp)
CRYPT_Free(temp);
if (imagepath)
CRYPT_Free(imagepath);
return FALSE; return FALSE;
} }
@ -517,10 +510,8 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
ret = CryptAcquireContextW(phProv, pContainer, pProvider, dwProvType, dwFlags); ret = CryptAcquireContextW(phProv, pContainer, pProvider, dwProvType, dwFlags);
if (pContainer) CRYPT_Free(pContainer);
CRYPT_Free(pContainer); CRYPT_Free(pProvider);
if (pProvider)
CRYPT_Free(pProvider);
return ret; return ret;
} }
@ -1663,7 +1654,7 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescripti
CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1); CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1);
result = CryptSignHashW(hHash, dwKeySpec, wsDescription, dwFlags, pbSignature, pdwSigLen); result = CryptSignHashW(hHash, dwKeySpec, wsDescription, dwFlags, pbSignature, pdwSigLen);
if (wsDescription) CRYPT_Free(wsDescription); CRYPT_Free(wsDescription);
return result; return result;
} }
@ -1962,7 +1953,7 @@ BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dw
CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1); CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1);
result = CryptVerifySignatureW(hHash, pbSignature, dwSigLen, hPubKey, wsDescription, dwFlags); result = CryptVerifySignatureW(hHash, pbSignature, dwSigLen, hPubKey, wsDescription, dwFlags);
if (wsDescription) CRYPT_Free(wsDescription); CRYPT_Free(wsDescription);
return result; return result;
} }