From b96ac007645c94c8f44ec8983f53c5b4a247cb43 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Thu, 5 Oct 2006 19:36:49 -0700 Subject: [PATCH] crypt32: Remove redundant NULL checks before CryptMemFree (found by Smatch). --- dlls/crypt32/protectdata.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 75846e748e4..9cc85849558 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -537,20 +537,13 @@ void free_protect_data(struct protect_data_t * pInfo) if (!pInfo) return; - if (pInfo->info0.pbData) - CryptMemFree(pInfo->info0.pbData); - if (pInfo->info1.pbData) - CryptMemFree(pInfo->info1.pbData); - if (pInfo->szDataDescr) - CryptMemFree(pInfo->szDataDescr); - if (pInfo->data0.pbData) - CryptMemFree(pInfo->data0.pbData); - if (pInfo->salt.pbData) - CryptMemFree(pInfo->salt.pbData); - if (pInfo->cipher.pbData) - CryptMemFree(pInfo->cipher.pbData); - if (pInfo->fingerprint.pbData) - CryptMemFree(pInfo->fingerprint.pbData); + CryptMemFree(pInfo->info0.pbData); + CryptMemFree(pInfo->info1.pbData); + CryptMemFree(pInfo->szDataDescr); + CryptMemFree(pInfo->data0.pbData); + CryptMemFree(pInfo->salt.pbData); + CryptMemFree(pInfo->cipher.pbData); + CryptMemFree(pInfo->fingerprint.pbData); } /* copies a string into a data blob */ @@ -768,7 +761,7 @@ BOOL load_encryption_key(HCRYPTPROV hProv, DATA_BLOB * salt, /* clean up */ CryptDestroyHash(hSaltHash); - if (szUsername) CryptMemFree(szUsername); + CryptMemFree(szUsername); return rc; } -- 2.11.4.GIT